axmol/tests/cpp-empty-test
andyque acae8a2535 Merge branch 'v3' into addChipmunkStaticLib
Conflicts:
	CMakeLists.txt
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/2d/cocos2d_wp8.vcxproj.filters
	cocos/CMakeLists.txt
2014-09-10 10:00:15 +08:00
..
Classes not create Vec as possible for setting position 2014-08-28 11:41:18 +08:00
Resources added missing files for wp8 2014-06-23 08:35:39 -07:00
proj-wp8-xaml remove chipmunk dependency 2014-09-05 21:59:30 +08:00
proj.android Android properties back to 10 2014-09-09 18:46:47 -07:00
proj.ios Platform fixed 2014-09-09 16:50:02 -07:00
proj.linux updates CMakeLists.txt 2014-03-11 19:10:37 +08:00
proj.mac Squashed commit of the following: 2014-09-09 12:18:31 -07:00
proj.win32 change toolset from 12.0 to 4.0 2014-09-09 15:57:21 +08:00
.cocos-project.json issue #4674: Re-added deleted source files. 2014-05-04 14:37:55 +08:00
CMakeLists.txt Squashed commit of the following: 2014-09-09 12:18:31 -07:00