update changelog and version (#20053)

minggo · web-flow · commit 50df439e87f8 · 2019-08-21T10:45:45.000+08:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,14 @@
+cocos2d-x-4.0  ??
+
+[HIGHLIGHT]     Support metal
+[HIGHLIGHT]     Use CMake for all platforms
+
+[REFINE]        Update glfw to 3.3
+
+[CHANGE]        remove deprecated functions
+[CHANGE]        remove h5 engine and JSB
+[CHANGE]        remove tiff
+
 cocos2d-x-3.17 May.21 2018
 
 [HIGHLIGHT]     Android: support Android Studio 3.0, NDK 16
diff --git a/cocos/cocos2d.cpp b/cocos/cocos2d.cpp
@@ -32,7 +32,7 @@ NS_CC_BEGIN
 
 CC_DLL const char* cocos2dVersion()
 {
-    return "cocos2d-x-4.0beta";
+    return "cocos2d-x-4.0rc0";
 }
 
 NS_CC_END

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ NS_CC_BEGIN`
`32`	`32`
`33`	`33`	`CC_DLL const char* cocos2dVersion()`
`34`	`34`	`{`
`35`		`- return "cocos2d-x-4.0beta";`
	`35`	`+ return "cocos2d-x-4.0rc0";`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`NS_CC_END`