aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorSebastien Bacher <seb128@ubuntu.com>2012-03-09 11:42:25 +0100
committerSebastien Bacher <seb128@ubuntu.com>2012-03-09 11:42:25 +0100
commit733d05b34953bfbfa31db852e2eaab72d659fadf (patch)
tree3529ce1a20ff2e153d4a99e31ba07b7ccf99b254 /tools
parentca576cbf1273ca628b97ae2e08e14c0dd525373b (diff)
parent77d28d4bba23bd23214cc0c5741a3a5dbcb19aee (diff)
downloadlibdbusmenu-733d05b34953bfbfa31db852e2eaab72d659fadf.tar.gz
libdbusmenu-733d05b34953bfbfa31db852e2eaab72d659fadf.tar.bz2
libdbusmenu-733d05b34953bfbfa31db852e2eaab72d659fadf.zip
* New upstream release.
* Setting the ATK Role on menu items (LP: #878708) * Cleaning up code paths to avoid goto's (LP: #940651) * Fixing setting an icon multiple times (LP: #934574)
Diffstat (limited to 'tools')
-rw-r--r--tools/Makefile.in6
-rw-r--r--tools/testapp/Makefile.in6
2 files changed, 12 insertions, 0 deletions
diff --git a/tools/Makefile.in b/tools/Makefile.in
index dd71113..7e39a1e 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -231,6 +231,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
@@ -323,6 +327,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
diff --git a/tools/testapp/Makefile.in b/tools/testapp/Makefile.in
index 6d8b3fd..4ab4a20 100644
--- a/tools/testapp/Makefile.in
+++ b/tools/testapp/Makefile.in
@@ -160,6 +160,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
@@ -252,6 +256,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@