Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/samples/Cpp/TestCpp
History
Ricardo Quesada d35cc3b0fa Merge branch 'develop' into clone_reverse_fixes 
Conflicts:
	cocos2dx/actions/CCAction.cpp
	cocos2dx/actions/CCActionEase.cpp
	cocos2dx/actions/CCActionGrid.cpp
	cocos2dx/actions/CCActionInstant.cpp
	cocos2dx/actions/CCActionInterval.cpp
	scripting/javascript/bindings/generated
 		2013-06-18 09:59:34 -07:00
..
.externalToolBuilders Adding missing eclipse project files 2013-03-07 12:13:50 -08:00
Classes Merge branch 'develop' into clone_reverse_fixes 2013-06-18 09:59:34 -07:00
Resources Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x 2013-06-08 22:09:34 +08:00
proj.android standardize code 2013-06-07 10:52:32 +08:00
proj.blackberry [BB] Updating project configuration after adding CocoStudio runtime. 2013-06-09 15:29:51 +08:00
proj.emscripten issue #2284: merge master and fixed some conflicts 2013-06-13 17:54:05 +08:00
proj.ios issue #2284: fix bugs after merging master 2013-06-14 14:34:50 +08:00
proj.linux issue #2284: merge master and fixed some conflicts 2013-06-13 17:54:05 +08:00
proj.mac issue #2284: fix bugs after merging master 2013-06-14 14:34:50 +08:00
proj.marmalade issue #2284: merge master and fixed some conflicts 2013-06-13 17:54:05 +08:00
proj.nacl fixed #2129: Rename m_iVar to _var, remove CC prefixes. 2013-06-15 14:03:30 +08:00
proj.tizen Merge pull request #2917 from pyrasis/tizen_2.1 2013-06-18 04:32:18 -07:00
proj.win32 issue #2284: fixing windows build. 2013-06-16 11:19:47 +08:00
.cproject Adding missing eclipse project files 2013-03-07 12:13:50 -08:00
Android.mk issue #2284: fix bugs after merging master 2013-06-14 14:34:50 +08:00