Two files pulled in from the pre2 branch. Removing the nsi file and cleaning the...

diff --git a/Makefile.am b/Makefile.am
index c5ae42c346fd78645bfe7069da7d8ea48b5cada7..b27604a8aca275cb33015225b72bed0718f3f058 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,7 +41,6 @@ EXTRA_DIST = \
        inkscape.spec           \
        Info.plist.in   \
        Info.plist              \
-       inkscape.nsi            \
        buildtool.cpp build.xml \
        README README.ca.txt README.de.txt README.es.txt README.fr.txt README.it.txt    \
        HACKING.txt HACKING.de.txt HACKING.fr.txt HACKING.it.txt        \

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5eb8afb9507229ce8a766ab23feade712dcd58e3..b3ca8fee179f3257b4df26bbd7527ea444e4676a 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -208,7 +208,6 @@ src/ui/clipboard.cpp
 src/ui/context-menu.cpp
 src/ui/dialog/aboutbox.cpp
 src/ui/dialog/align-and-distribute.cpp
-src/ui/dialog/calligraphic-presets.h
 src/ui/dialog/calligraphic-profile-rename.cpp
 src/ui/dialog/debug.cpp
 src/ui/dialog/document-metadata.cpp
@@ -291,6 +290,7 @@ share/extensions/perspective.py
 share/extensions/polyhedron_3d.py
 share/extensions/summersnight.py
 share/extensions/svg_and_media_zip_output.py
+share/extensions/uniconv_output.py
 share/extensions/web-set-att.py
 share/extensions/web-transmit-att.py
 [type: gettext/xml] share/extensions/addnodes.inx