Merge remote-tracking branch 'origin/master'

mr-kelly · mr-kelly · commit 1f88e1165c83 · 2014-10-29T09:33:47.000+08:00
Conflicts:
	Assets/CosmosEngine/Editor/CosmosEngineEditor/CTestTools.cs.meta
	Assets/CosmosEngine/Scripts/Utils/CTabReader.cs.meta
	Assets/CosmosEngine/Scripts/Utils/ICTabReadble.cs.meta
	Assets/Editor/CBuild_Audio.cs.meta
	Assets/Resources/CEngineConfig.txt
	logs/game.log
diff --git a/Assets/CosmosEngine/Editor/CosmosEngineEditor/CBuild_UI.cs b/Assets/CosmosEngine/Editor/CosmosEngineEditor/CBuild_UI.cs
@@ -239,7 +239,7 @@ public static void ExportUIMenu()
     }
 
     /// <summary>
-    /// Buidl All UI Scene under Assets/Products/ folder
+    /// Buidl All UI Scene under Assets/_ResourcesBuild_s/ folder
     /// </summary>
     [MenuItem("CosmosEngine/UI/Export All UI")]
     public static void ExportAllUI()

Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,7 @@ public static void ExportUIMenu()`
`239`	`239`	`}`
`240`	`240`
`241`	`241`	`/// <summary>`
`242`		`- /// Buidl All UI Scene under Assets/Products/ folder`
	`242`	`+ /// Buidl All UI Scene under Assets/_ResourcesBuild_s/ folder`
`243`	`243`	`/// </summary>`
`244`	`244`	`[MenuItem("CosmosEngine/UI/Export All UI")]`
`245`	`245`	`public static void ExportAllUI()`