Code

* Merge from trunk
authorKrzysztof Kosiński <tweenk.pl@gmail.com>
Thu, 14 Jan 2010 08:13:09 +0000 (09:13 +0100)
committerKrzysztof Kosiński <tweenk.pl@gmail.com>
Thu, 14 Jan 2010 08:13:09 +0000 (09:13 +0100)
commit9eb3f5487e349bceb5be7b5c41b20710ee798038
tree1fec13b3616ecc90fb251bb9e643aefc43c80c43
parent9c07ca6fa6d1f672d40c8c11a907c6bbc3592a6f
parent89694abbbf7ad16df214d9c2e40c28ba0bb316aa
* Merge from trunk
* Update to new snapping API
* Modify the join action slightly
26 files changed:
configure.ac
po/POTFILES.in
po/POTFILES.skip
src/Makefile.am
src/Makefile_insert
src/desktop.cpp
src/desktop.h
src/event-context.cpp
src/extension/dxf2svg/entities2elements.cpp
src/libnrtype/FontFactory.cpp
src/libnrtype/FontFactory.h
src/libnrtype/FontInstance.cpp
src/nodepath.cpp
src/preferences-skeleton.h
src/selection-chemistry.cpp
src/snap.cpp
src/snap.h
src/snapper.h
src/tools-switch.cpp
src/ui/dialog/align-and-distribute.cpp
src/ui/dialog/inkscape-preferences.cpp
src/ui/dialog/inkscape-preferences.h
src/ui/tool/multi-path-manipulator.cpp
src/ui/tool/node.cpp
src/verbs.cpp
src/widgets/toolbox.cpp