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 /configure.ac | |
| 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 'configure.ac')
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 8d6b0f5a..1d917d45 100644 --- a/configure.ac +++ b/configure.ac @@ -311,7 +311,7 @@ capplets/about-me/Makefile capplets/about-me/mate-about-me.desktop.in capplets/about-me/icons/Makefile capplets/accessibility/Makefile -capplets/accessibility/at-properties/at-properties.desktop.in +capplets/accessibility/at-properties/mate-at-properties.desktop.in capplets/accessibility/at-properties/Makefile capplets/appearance/Makefile capplets/appearance/data/Makefile @@ -322,18 +322,18 @@ capplets/default-applications/Makefile capplets/default-applications/mate-default-applications-properties.desktop.in capplets/default-applications/mate-default-applications.pc capplets/display/Makefile -capplets/display/display-properties.desktop.in +capplets/display/mate-display-properties.desktop.in capplets/keybindings/Makefile capplets/keybindings/mate-keybindings.pc capplets/keybindings/mate-keybinding.desktop.in capplets/keyboard/Makefile -capplets/keyboard/keyboard.desktop.in +capplets/keyboard/mate-keyboard.desktop.in capplets/mouse/Makefile capplets/mouse/mate-settings-mouse.desktop.in capplets/network/Makefile capplets/network/mate-network-properties.desktop.in capplets/windows/Makefile -capplets/windows/window-properties.desktop.in +capplets/windows/mate-window-properties.desktop.in font-viewer/Makefile font-viewer/mate-font-viewer.desktop.in help/Makefile |