summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Dufour <nicoduf@yahoo.fr>2016-03-14 17:19:58 +0000
committerJazzyNico <nicoduf@yahoo.fr>2016-03-14 17:19:58 +0000
commit423f16a37b9dfde787bce560c802034380f4be25 (patch)
treeb6349717d1cdd12920d42af9756bf19156a3093e
parentFix a bug meassuring text in units diferent than PX (diff)
downloadinkscape-423f16a37b9dfde787bce560c802034380f4be25.tar.gz
inkscape-423f16a37b9dfde787bce560c802034380f4be25.zip
Bug #1545333 - Add new generated file 'inkscape.appdata.xml' to .bzrignore (for in-tree builds).
Bug #1545333 - Remove duplicate entry 'filtereffects' from preferences skeleton. (bzr r14705)
-rw-r--r--.bzrignore1
-rw-r--r--src/preferences-skeleton.h1
2 files changed, 1 insertions, 1 deletions
diff --git a/.bzrignore b/.bzrignore
index 5f5e524d2..6f725aa26 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -48,6 +48,7 @@
./man/inkscape.zh_TW.1
./man/inkscape.zh_TW.pod
./man/inkscape.zh_TW.tmp
+./inkscape.appdata.xml
./inkscape.spec
./inkview.1
./install
diff --git a/src/preferences-skeleton.h b/src/preferences-skeleton.h
index b428cbe7a..9f2e68b1d 100644
--- a/src/preferences-skeleton.h
+++ b/src/preferences-skeleton.h
@@ -216,7 +216,6 @@ static char const preferences_skeleton[] =
" <group id=\"input\" />\n"
" <group id=\"colorpickerwindow\" />\n"
" <group id=\"undo-history\" />\n"
-" <group id=\"filtereffects\" />\n"
" <group id=\"transparency\"\n"
" on-focus=\"1.0\"\n"
" on-blur=\"0.50\"\n"