summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPerberos <[email protected]>2011-11-15 17:58:52 -0300
committerPerberos <[email protected]>2011-11-15 17:58:52 -0300
commit01c3c5b000d9b033a32f4892c0fedd2df1225f34 (patch)
tree2d75ddb0f6eccc35e7d40b4f89503be7f6d47d3c
parent9025ac21fe2c765393fd46a42e437bc8618449f9 (diff)
downloadmate-applets-01c3c5b000d9b033a32f4892c0fedd2df1225f34.tar.bz2
mate-applets-01c3c5b000d9b033a32f4892c0fedd2df1225f34.tar.xz
fixing file conflicts con accessx-status applet
-rw-r--r--accessx-status/pixmaps/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/accessx-status/pixmaps/Makefile.am b/accessx-status/pixmaps/Makefile.am
index 91ba6137..5b2e91f0 100644
--- a/accessx-status/pixmaps/Makefile.am
+++ b/accessx-status/pixmaps/Makefile.am
@@ -1,7 +1,7 @@
accessx_status_iconsdir = $(iconsdir)/mate/48x48/apps
accessx_status_icons_DATA = ax-applet.png
-accessx_status_pixmapsdir = $(pixmapsdir)/accessx-status-applet
+accessx_status_pixmapsdir = $(pixmapsdir)/mate-accessx-status-applet
accessx_status_pixmaps_DATA = \
ax-applet.png \
ax-key-base.png \