James Chen dc7fcce0fe Merge branch 'iss2430-modify_enum' of https://github.com/minggo/cocos2d-x into minggo-iss2430-modify_enum ... Conflicts: scripting/javascript/bindings/generated scripting/lua/cocos2dx_support/LuaCocos2d.cpp		2013-07-26 21:22:16 +08:00
..
Cpp	Merge branch 'iss2430-modify_enum' of https://github.com/minggo/cocos2d-x into minggo-iss2430-modify_enum	2013-07-26 21:22:16 +08:00
Javascript	issue #2430: Refactoring enum 'ResolutionPolicy'.	2013-07-26 18:18:58 +08:00
Lua	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into constants-refactor	2013-07-26 19:56:04 +08:00
samples.xcodeproj	issue #2426:Add Drawprimitives.lua and Drawprimitives lua test sample	2013-07-24 10:15:16 +08:00