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/pixmaps/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/pixmaps/Makefile.am')
| -rw-r--r-- | stickynotes/pixmaps/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/stickynotes/pixmaps/Makefile.am b/stickynotes/pixmaps/Makefile.am index 95634b58..837ecbb8 100644 --- a/stickynotes/pixmaps/Makefile.am +++ b/stickynotes/pixmaps/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -stickynotes_applet_pixmapsdir = $(datadir)/pixmaps/stickynotes +stickynotes_applet_pixmapsdir = $(datadir)/pixmaps/mate-stickynotes stickynotes_applet_pixmaps_DATA = \ locked.png \ unlocked.png \ |