From af72cd61050c413137c6a48684f571e323a41f75 Mon Sep 17 00:00:00 2001
From: Claudio Rodrigo Pereyra Diaz <elsupergomez@gmail.com>
Date: Fri, 11 Oct 2013 10:51:42 -0300
Subject: Update mate-settings.menu

Add MergeDir to merge menus in preferences-merged
---
 layout/mate-settings.menu | 1 +
 1 file changed, 1 insertion(+)

(limited to 'layout')

diff --git a/layout/mate-settings.menu b/layout/mate-settings.menu
index f671335..29e07b7 100644
--- a/layout/mate-settings.menu
+++ b/layout/mate-settings.menu
@@ -12,6 +12,7 @@
 
   <!-- Read in overrides and child menus from applications-merged/ -->
   <DefaultMergeDirs/>
+  <MergeDir>preferences-merged</MergeDir>
 
   <!-- Add a link to the control center -->
   <Include>
-- 
cgit v1.2.1