Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/samples/Javascript
History
bmanGH 271e58d562 Merge remote-tracking branch 'upstream/develop' into develop 
Conflicts:
	cocos/scripting/auto-generated
	plugin
	samples/Javascript/Shared
	tools/bindings-generator
 		2014-01-14 19:00:02 +08:00
..
CocosDragonJS update describe for support translucency on android 2013-12-30 18:12:43 +08:00
CrystalCraze update describe for support translucency on android 2013-12-30 18:12:43 +08:00
MoonWarriors update describe for support translucency on android 2013-12-30 18:12:43 +08:00
Shared@4a79b73b82 Updates JS-Test submodule. 2014-01-07 18:01:22 +08:00
TestJavascript Wrong search path fix for CocoStudioTest/SceneTest 2014-01-06 14:49:32 +08:00
WatermelonWithMe update describe for support translucency on android 2013-12-30 18:12:43 +08:00