Code

Merge from trunk
authorTed Gould <ted@canonical.com>
Sat, 1 Nov 2008 03:43:30 +0000 (22:43 -0500)
committerTed Gould <ted@canonical.com>
Sat, 1 Nov 2008 03:43:30 +0000 (22:43 -0500)
commit3bd80e038b72ad220f218d7053a9089685fab17c
tree78f551f42f8331a8a4336bdc6a53fb88d6dfda92
parentf4c06c59e82cee390f68adb66a05acaca307566f
Merge from trunk
po/de.po
po/nl.po
share/extensions/funcplot.inx
src/extension/internal/cairo-renderer.cpp
src/extension/internal/odf.cpp
src/sp-shape.cpp