Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/tests
History
James Chen 3a410c14a1 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1324_create 
Conflicts:
	cocos2dx/extensions/CCBReader/CCBReader_v2.cpp
	cocos2dx/extensions/CCControlExtension/CCScale9Sprite.cpp
	cocos2dx/label_nodes/CCLabelBMFont.cpp
	cocos2dx/menu_nodes/CCMenuItem.cpp
	cocos2dx/menu_nodes/CCMenuItem.h
	cocos2dx/misc_nodes/CCRenderTexture.h
	cocos2dx/tileMap_parallax_nodes/CCTileMapAtlas.cpp
	tests/tests/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder.cpp
	tests/tests/LabelTest/LabelTest.cpp
 		2012-06-14 17:36:31 +08:00
..
Resources Merge with gles20. 2012-06-13 15:56:52 -07:00
proj.android fixed #1322: vertical alignment works ok on android 2012-06-13 18:33:44 +08:00
proj.ios Merge with gles20. 2012-06-13 15:56:52 -07:00
proj.win32 issue #1310: Updated vs2008 project setting. 2012-06-12 18:15:25 +08:00
tests Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1324_create 2012-06-14 17:36:31 +08:00
Android.mk Merge with gles20. 2012-06-13 15:56:52 -07:00
AppDelegate.cpp issue #1324: Added create() for static member functions that new an autorelease object 2012-06-14 15:13:16 +08:00
AppDelegate.h issue #1204: Removed CCApplication::initInstance. 2012-05-02 17:50:26 +08:00