diff options
| author | Stefano Karapetsas <[email protected]> | 2013-09-03 02:58:28 -0700 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-09-03 02:58:28 -0700 |
| commit | 7e4e13ed1ce1e2e9ab31f99c9a80281160121156 (patch) | |
| tree | 939edddf6f27aa08339b75192415e2c97b849b84 /capplets/keyboard | |
| parent | 2b05d5f5a1cbaebabf6b335d033b66306c14b95e (diff) | |
| parent | 0cb71614dc9c275691964603024495cdf12f43ad (diff) | |
| download | mate-control-center-7e4e13ed1ce1e2e9ab31f99c9a80281160121156.tar.bz2 mate-control-center-7e4e13ed1ce1e2e9ab31f99c9a80281160121156.tar.xz | |
Merge pull request #69 from infirit/master
Rename .desktop files to avoid file collision with Gnome2
Diffstat (limited to 'capplets/keyboard')
| -rw-r--r-- | capplets/keyboard/Makefile.am | 2 | ||||
| -rw-r--r-- | capplets/keyboard/mate-keyboard.desktop.in.in (renamed from capplets/keyboard/keyboard.desktop.in.in) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/capplets/keyboard/Makefile.am b/capplets/keyboard/Makefile.am index 58cbb1ae..0b48fbbd 100644 --- a/capplets/keyboard/Makefile.am +++ b/capplets/keyboard/Makefile.am @@ -27,7 +27,7 @@ dist_ui_DATA = mate-keyboard-properties-a11y-notifications.ui \ mate-keyboard-properties-options-dialog.ui desktopdir = $(datadir)/applications -Desktop_in_files = keyboard.desktop.in +Desktop_in_files = mate-keyboard.desktop.in desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) AM_CPPFLAGS = \ diff --git a/capplets/keyboard/keyboard.desktop.in.in b/capplets/keyboard/mate-keyboard.desktop.in.in index 2c9cb013..2c9cb013 100644 --- a/capplets/keyboard/keyboard.desktop.in.in +++ b/capplets/keyboard/mate-keyboard.desktop.in.in |