Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/tests/test.marmalade
History
dumganhar 8298e0b6ff Merge branch 'master' of https://github.com/styck/cocos2d-x into pullrequest#611 
Conflicts:
	tests/test.marmalade/test.mkb
 		2011-12-15 13:03:07 +08:00
..
Main.cpp Updated ccLanguageType CCApplication::getCurrentLanguage() to return the current language 2011-12-11 17:18:01 -08:00
Main.h Updated ccLanguageType CCApplication::getCurrentLanguage() to return the current language 2011-12-11 17:18:01 -08:00
test.mkb Merge branch 'master' of https://github.com/styck/cocos2d-x into pullrequest#611 2011-12-15 13:03:07 +08:00