diff options
author | Perberos <[email protected]> | 2011-11-15 18:23:47 -0300 |
---|---|---|
committer | Perberos <[email protected]> | 2011-11-15 18:23:47 -0300 |
commit | ae2b93a6f78a987062a96a34907be3b343436577 (patch) | |
tree | c7b16153e64f42f39828f71131d2c7228d717daf /stickynotes/Makefile.am | |
parent | 01f6cac0620849cb01605e90c4d842f620a9c290 (diff) | |
download | mate-applets-ae2b93a6f78a987062a96a34907be3b343436577.tar.bz2 mate-applets-ae2b93a6f78a987062a96a34907be3b343436577.tar.xz |
fixing file conflicts on stickynotes applet
Diffstat (limited to 'stickynotes/Makefile.am')
-rw-r--r-- | stickynotes/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/stickynotes/Makefile.am b/stickynotes/Makefile.am index 2f1e8fef..9a0fa9c0 100644 --- a/stickynotes/Makefile.am +++ b/stickynotes/Makefile.am @@ -16,7 +16,7 @@ INCLUDES = \ $(LIBWNCK_CFLAGS) \ $(XML2_CFLAGS) \ -DSTICKYNOTES_MENU_UI_DIR=\""$(uidir)"\"\ - -DSTICKYNOTES_ICONDIR=\"$(datadir)/pixmaps/stickynotes/\" + -DSTICKYNOTES_ICONDIR=\"$(datadir)/pixmaps/mate-stickynotes/\" libexec_PROGRAMS = stickynotes_applet |