[Xfce4-commits] <garcon:master> Add <DefaultMergeDirs/> to xfce-applications.menu.

[Jannis Pohlmann]

Updating branch refs/heads/master
         to 2f756f3b33c049bd375ad988e7ef703f7c5deadc (commit)
       from 32877ade7de804912b955d8daa00e31c0b8346c4 (commit)

commit 2f756f3b33c049bd375ad988e7ef703f7c5deadc
Author: Jannis Pohlmann <jannis at xfce.org>
Date:   Sat Feb 12 13:51:59 2011 +0100

    Add <DefaultMergeDirs/> to xfce-applications.menu.
    
    This allows third parties to install their own submenus without having
    to touch xfce-applications.menu at all.

 NEWS                             |    1 +
 data/xfce/xfce-applications.menu |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/NEWS b/NEWS
index 8ba5001..54b7827 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,6 @@
 0.1.x
 =====
+- Add <DefaultMergeDirs/> to xfce-applications.menu.
 
 
 0.1.5
diff --git a/data/xfce/xfce-applications.menu b/data/xfce/xfce-applications.menu
index d4a641a..f5a9573 100644
--- a/data/xfce/xfce-applications.menu
+++ b/data/xfce/xfce-applications.menu
@@ -6,6 +6,7 @@
 
     <DefaultAppDirs/>
     <DefaultDirectoryDirs/>
+    <DefaultMergeDirs/>
 
     <Include>
         <Category>X-Xfce-Toplevel</Category>