diff options
| author | Stefano Karapetsas <[email protected]> | 2013-12-23 11:21:21 -0800 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-12-23 11:21:21 -0800 |
| commit | eecaa6cf912640153afee8356aabc39c918101c0 (patch) | |
| tree | b0d850afc3ba4865b761764fda84206e6d239f2a /capplets/keyboard | |
| parent | 7c719d6bebe37bfff23e6c0b8241ebb94a086e0e (diff) | |
| parent | 52ae123edd9b132d04db6199541a797ecc414015 (diff) | |
| download | mate-control-center-eecaa6cf912640153afee8356aabc39c918101c0.tar.bz2 mate-control-center-eecaa6cf912640153afee8356aabc39c918101c0.tar.xz | |
Merge pull request #79 from infirit/1.6
Cherrypick usefull commits from master
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 |