Code

Merge from trunk
authorTed Gould <ted@canonical.com>
Fri, 31 Oct 2008 15:06:16 +0000 (10:06 -0500)
committerTed Gould <ted@canonical.com>
Fri, 31 Oct 2008 15:06:16 +0000 (10:06 -0500)
commit7079a43aa387066c2f67402d77dbe3db981b1054
treea857d7aae5f544c4243a331e4eb4e4629bbc27a9
parent01d27eab5fca2dcb8e883011f8be77ae6b78a11c
Merge from trunk
52 files changed:
build.xml
configure.ac
share/icons/icons.svg
src/Makefile.am
src/dialogs/xml-tree.cpp
src/display/sp-canvas.cpp
src/draw-context.cpp
src/extension/internal/Makefile_insert
src/extension/internal/cairo-render-context.cpp
src/extension/internal/cairo-renderer.cpp
src/extension/internal/emf-win32-inout.cpp
src/extension/internal/emf-win32-inout.h
src/extension/internal/emf-win32-print.cpp
src/extension/internal/emf-win32-print.h
src/extension/internal/win32.cpp
src/extension/internal/win32.h
src/gradient-chemistry.cpp
src/gradient-chemistry.h
src/libgdl/Makefile_insert
src/libgdl/gdl-win32.c
src/libgdl/gdl-win32.h
src/libnrtype/FontFactory.cpp
src/libnrtype/FontInstance.cpp
src/libnrtype/Layout-TNG-Input.cpp
src/main.cpp
src/nodepath.cpp
src/pen-context.cpp
src/selection-chemistry.cpp
src/seltrans.cpp
src/snap-preferences.cpp
src/snap.cpp
src/snap.h
src/snapped-point.cpp
src/snapped-point.h
src/sp-gradient-test.h
src/sp-gradient.cpp
src/sp-gradient.h
src/sp-paint-server.cpp
src/sp-paint-server.h
src/sp-pattern.cpp
src/sp-pattern.h
src/sp-shape.cpp
src/svg/path-string.cpp
src/svg/path-string.h
src/svg/svg-affine.cpp
src/ui/dialog/Makefile_insert
src/ui/dialog/filedialogimpl-gtkmm.h
src/ui/dialog/filedialogimpl-win32.cpp
src/ui/dialog/filter-effects-dialog.cpp
src/ui/dialog/filter-effects-dialog.h
src/ui/widget/object-composite-settings.cpp
src/ui/widget/object-composite-settings.h