minggo 63d0f66553 Merge pull request #7189 from andyque/feature5161 ... replace size with contentSize		2014-06-24 18:43:33 +08:00
..
Classes	Merge pull request #7189 from andyque/feature5161	2014-06-24 18:43:33 +08:00
Resources	remove unused override method	2014-06-23 15:46:07 +08:00
proj.android	add new line at the end of a file to *.mk	2014-06-19 20:43:27 +09:00
proj.ios	Fixes compiler warnings for mac and ios	2014-05-22 16:34:16 -03:00
proj.linux	Renames 'samples' folder to 'tests', ouch....	2014-03-11 19:10:34 +08:00
proj.mac	issue #4674: Re-added deleted source files.	2014-05-04 14:37:55 +08:00
proj.win32	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3	2014-06-20 10:51:13 +08:00
proj.wp8-xaml	added missing files and tests that broke wp8 build	2014-06-20 09:07:51 -07:00
.cocos-project.json	issue #4674: Re-added deleted source files.	2014-05-04 14:37:55 +08:00
Android.mk	fixed android compile failed	2014-06-15 13:10:44 +08:00
CMakeLists.txt	Merge pull request #6945 from John-He-928/mingw-build	2014-06-19 22:08:28 +08:00