[Blends-commit] [SCM] ezgo branch, ezgo12, updated. 86cee21ba7560ff27b3ae82542a3f2a106bc404a

[Franklin]

The following commit has been merged in the ezgo12 branch:
commit cf02a278d1318bbc8618e8045dcb5bf8d67ce1d3
Author: Franklin <franklin at goodhorse.idv.tw>
Date:   Wed Mar 18 13:33:28 2015 +0800

    Reopen DefaultMergeDirs in branch ezgo12

diff --git a/ezgo-menu/xdg/ezgo-applications.menu b/ezgo-menu/xdg/ezgo-applications.menu
index d0966bf..7d76813 100644
--- a/ezgo-menu/xdg/ezgo-applications.menu
+++ b/ezgo-menu/xdg/ezgo-applications.menu
@@ -5,7 +5,7 @@
 	<Directory>ezgo.directory</Directory>
 	<KDELegacyDirs/>
 <!--	<DefaultAppDirs/> -->
-<!--	<DefaultMergeDirs/> -->
+	<DefaultMergeDirs/>
 	<DefaultDirectoryDirs/>
 	<AppDir>/usr/share/ezgo/ezgo-menu/applications</AppDir>
 	<DirectoryDir>/usr/share/ezgo/ezgo-menu/desktop-directories</DirectoryDir>

-- 
Blend for educatipn with asian specific adaptations