James Chen 477fc9f0e0 Merge commit 'refs/pull/6012/head' of git://github.com/cocos2d/cocos2d-x into pull/6012 ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj		2014-04-25 10:59:11 +08:00
..
Classes	Merge commit 'refs/pull/6012/head' of git://github.com/cocos2d/cocos2d-x into pull/6012	2014-04-25 10:59:11 +08:00
Resources	add background.wav to wp8 to play	2014-03-31 11:46:39 +08:00
proj.android	Solve the error effect of clipping in cpp-tests & lua-tests.	2014-03-28 17:45:28 +08:00
proj.ios	remove unused accelerometer	2014-03-20 14:29:05 +08:00
proj.linux	…
proj.mac	lua-empty-test, cpp-empty-test work for iOS/Mac	2014-03-11 19:10:36 +08:00
proj.win32	Merge commit 'refs/pull/6012/head' of git://github.com/cocos2d/cocos2d-x into pull/6012	2014-04-25 10:59:11 +08:00
proj.wp8-xaml	input event refactor. console enabled for wp8	2014-04-19 10:10:44 -07:00
Android.mk	Whoops... Shouldn't remove the test cpp.	2014-04-08 10:40:32 -07:00
CMakeLists.txt	Attempt to fix the linux build.	2014-04-08 22:29:40 -07:00