summaryrefslogtreecommitdiffstats
path: root/src/extension
diff options
context:
space:
mode:
authorsu_v <suv-sf@users.sourceforge.net>2012-11-26 06:56:29 +0000
committer~suv <suv-sf@users.sourceforge.net>2012-11-26 06:56:29 +0000
commit0f140e037d3b84ca7664c9a18b5bd977b912d6c2 (patch)
tree559b8b9215dcf4a688a480ae1dc3f557d3036d05 /src/extension
parentmerge from trunk (r11871) (diff)
parentFix undo history entry for layer renaming to be consistent with 'Rename Layer... (diff)
downloadinkscape-0f140e037d3b84ca7664c9a18b5bd977b912d6c2.tar.gz
inkscape-0f140e037d3b84ca7664c9a18b5bd977b912d6c2.zip
merge from trunk (r11903)
(bzr r11668.1.42)
Diffstat (limited to 'src/extension')
-rw-r--r--src/extension/Makefile_insert1
-rw-r--r--src/extension/effect.h2
-rw-r--r--src/extension/internal/Makefile_insert16
3 files changed, 15 insertions, 4 deletions
diff --git a/src/extension/Makefile_insert b/src/extension/Makefile_insert
index ffcee5f9a..4e75de13a 100644
--- a/src/extension/Makefile_insert
+++ b/src/extension/Makefile_insert
@@ -3,7 +3,6 @@
ink_common_sources += \
extension/extension.cpp \
extension/extension.h \
- extension/extension-forward.h \
extension/db.cpp \
extension/db.h \
extension/dependency.cpp \
diff --git a/src/extension/effect.h b/src/extension/effect.h
index bb36b9238..6616a23ec 100644
--- a/src/extension/effect.h
+++ b/src/extension/effect.h
@@ -67,7 +67,7 @@ class Effect : public Extension {
gchar const * image,
Effect * effect,
bool showPrefs) :
- Verb(id, _(name), _(tip), image),
+ Verb(id, _(name), _(tip), image, _("Extensions")),
_effect(effect),
_showPrefs(showPrefs),
_elip_name(NULL) {
diff --git a/src/extension/internal/Makefile_insert b/src/extension/internal/Makefile_insert
index c4dbaa77a..a13c8a6ae 100644
--- a/src/extension/internal/Makefile_insert
+++ b/src/extension/internal/Makefile_insert
@@ -132,12 +132,24 @@ ink_common_sources += \
extension/internal/latex-pstricks.h \
extension/internal/latex-pstricks-out.cpp \
extension/internal/latex-pstricks-out.h \
+ extension/internal/filter/bevels.h \
+ extension/internal/filter/blurs.h \
+ extension/internal/filter/bumps.h \
+ extension/internal/filter/color.h \
+ extension/internal/filter/distort.h \
+ extension/internal/filter/filter.h \
+ extension/internal/filter/image.h \
+ extension/internal/filter/morphology.h \
+ extension/internal/filter/overlays.h \
+ extension/internal/filter/paint.h \
+ extension/internal/filter/protrusions.h \
+ extension/internal/filter/shadows.h \
+ extension/internal/filter/textures.h \
+ extension/internal/filter/transparency.h \
extension/internal/filter/filter-all.cpp \
extension/internal/filter/filter-file.cpp \
extension/internal/filter/filter.cpp \
extension/internal/filter/filter.h \
- extension/internal/filter/drop-shadow.h \
- extension/internal/filter/snow.h \
extension/internal/uemf.c \
extension/internal/uemf.h \
extension/internal/uemf_endian.c \