James Chen b044a89d6f Merge branch 'gles20' of https://github.com/ivzave/cocos2d-x into linux-lua ... Conflicts: scripting/lua/cocos2dx_support/LuaCocos2d.cpp		2012-12-06 14:55:18 +08:00
..
CocosDragonJS	do some bug fixes	2012-12-04 18:44:32 +08:00
HelloCpp	[Marmalade fix] Added development.icf for HelloCpp. Added Marker Felt.ttf for SampleGame.	2012-12-04 21:54:19 +08:00
HelloLua	Merge branch 'gles20' of https://github.com/ivzave/cocos2d-x into linux-lua	2012-12-06 14:55:18 +08:00
MoonWarriors	Updated samples/MoonWarriors/proj.android/build_native.sh. Because the boot file has been changed from MoonWarriors-native.js to MoonWarriors-jsb.js.	2012-12-04 20:07:23 +08:00
SimpleGame	Remove hardcoded android:debuggable property	2012-12-03 13:34:55 -08:00
TestCpp	add Hungarian language support	2012-12-05 11:31:05 +01:00
TestJavascript	update cocos2d-js-tests to up-stream	2012-12-04 14:00:29 +08:00
TestLua	Merge branch 'gles20' of https://github.com/ivzave/cocos2d-x into linux-lua	2012-12-06 14:55:18 +08:00
WatermelonWithMe	fixed missing level.js for WatermelonWithMe.	2012-12-04 17:46:51 +08:00