zhangbin 1f491cf656 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3-jsb ... Conflicts: build/cocos2d-wp8.sln		2015-04-16 17:04:07 +08:00
..
cpp-template-default	remove wp8 from cpp templates	2015-04-15 10:01:41 -07:00
js-template-default	Solve the warning when creating js project.	2015-04-16 16:51:58 +08:00
lua-template-default	Update the related project setting for Luajit and related test cases	2015-04-06 22:41:34 +08:00
cocos2dx_files.json	Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3-jsb	2015-04-16 17:04:07 +08:00