xubuntu-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 259
committer: Lionel Le Folgoc <mrpouit@xxxxxxxxxx>
branch nick: xubuntu-default-settings
timestamp: Sat 2011-02-12 00:38:30 +0100
message:
    more duplicate entries. Also add a missing <DefaultMergeDirs/> tag.
modified:
  debian/changelog
  etc/xdg/xdg-xubuntu/menus/xfce-applications.menu


--
lp:xubuntu-default-settings
https://code.launchpad.net/~xubuntu-dev/xubuntu-default-settings/trunk

Your team Xubuntu Team is subscribed to branch lp:xubuntu-default-settings.
To unsubscribe from this branch go to https://code.launchpad.net/~xubuntu-dev/xubuntu-default-settings/trunk/+edit-subscription

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-10 20:35:03 +0000
+++ debian/changelog	2011-02-11 23:38:30 +0000
@@ -4,13 +4,13 @@
     resync default keyboard shortcuts with upstream; mostly add shortcuts
     for 'xfce4-display-settings --minimal'.
   * etc/xdg/xdg-xubuntu/menus/xfce-applications.menu: small cleanup; hide
-    more duplicate entries.
+    more duplicate entries. Also add a missing <DefaultMergeDirs/> tag.
   * etc/xdg/xdg-xubuntu/xfce4/xfconf/…/xfce4-panel.xml: use exo wrappers
     instead of firefox/thunderbird/xfce4-terminal directly; this allows
     users to change the preferred applications and to keep functional
     launchers.
 
- -- Lionel Le Folgoc <mrpouit@xxxxxxxxxx>  Thu, 10 Feb 2011 00:25:22 +0100
+ -- Lionel Le Folgoc <mrpouit@xxxxxxxxxx>  Sat, 12 Feb 2011 00:37:25 +0100
 
 xubuntu-default-settings (11.04.6) natty; urgency=low
 

=== modified file 'etc/xdg/xdg-xubuntu/menus/xfce-applications.menu'
--- etc/xdg/xdg-xubuntu/menus/xfce-applications.menu	2011-02-10 18:52:49 +0000
+++ etc/xdg/xdg-xubuntu/menus/xfce-applications.menu	2011-02-11 23:38:30 +0000
@@ -6,6 +6,7 @@
 
     <DefaultAppDirs/>
     <DefaultDirectoryDirs/>
+    <DefaultMergeDirs/>
 
     <Include>
         <Filename>ubuntu-software-center.desktop</Filename>