Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
14,582 Commits 2 Branches 34 Tags 1.2 GiB
Commit Graph

7 Commits

Author SHA1 Message Date
chengstory 263c4fbb0a fixed #3457 remove unused comment. 2013-12-26 12:58:34 +08:00
chengstory 8ae7ecff33 Merge branch 'develop' into #3457 
Conflicts:
	build/cocos2d_samples.xcodeproj/project.pbxproj
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
	cocos/editor-support/cocostudio/CCSGUIReader.h
 2013-12-26 12:55:52 +08:00
chengstory 6acf422f3b fixed #3185 support for html5. 2013-11-14 17:03:45 +08:00
chengstory 41975ba445 fixed #3185 ComponentTest and SceneTest NULL to nullptr. 2013-11-14 14:16:14 +08:00
chengstory 14d51f9f35 fixed #3185 2013-11-14 13:28:42 +08:00
minggo 6fc2be62f5 issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
zhangcheng 98fce2fa84 1. update Samples on develop branch. 2013-09-10 09:53:15 +08:00