blob: 266678df204cbcbb9eb308712f66233b298a0dea (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
|
--- layout/settings.menu.orig Wed Jan 5 20:12:16 2005
+++ layout/settings.menu Tue Mar 1 01:28:57 2005
@@ -15,9 +15,6 @@
<DefaultAppDirs/>
<DefaultDirectoryDirs/>
- <!-- Read in overrides and child menus from applications-merged/ -->
- <DefaultMergeDirs/>
-
<!-- Merge in these other files as submenus -->
<Menu>
<Name>Preferences</Name>
@@ -30,10 +27,19 @@
<Directory>System-Settings.directory</Directory>
<Include>
<And>
+ <Not>
+ <Or>
+ <Category>Qt</Category>
+ <Category>KDE</Category>
+ </Or>
+ </Not>
<Category>Settings</Category>
<Category>System</Category>
</And>
</Include>
</Menu> <!-- End System Settings -->
+
+ <!-- Read in overrides and child menus from settings-merged/ -->
+ <DefaultMergeDirs/>
</Menu> <!-- End Applications -->
|
