James Chen 0305ff15db Merge pull request #4625 from dabingnn/develop_NewClippingNode ... Develop new clipping node		2013-12-23 23:20:38 -08:00
..
.externalToolBuilders	Adding missing eclipse project files	2013-03-07 12:13:50 -08:00
Classes	Merge pull request #4625 from dabingnn/develop_NewClippingNode	2013-12-23 23:20:38 -08:00
Resources	Updates spine test.	2013-12-19 21:35:43 +08:00
proj.android	remove android properties change by eclipse	2013-12-16 19:22:40 +08:00
proj.ios	issue #2800:Can not hide status bar on iOS 7	2013-09-13 15:54:58 +08:00
proj.linux	Merge folder changes from develop	2013-10-30 23:19:36 -07:00
proj.mac	Icons for test projects	2013-10-16 11:55:14 -07:00
proj.win32	update vs project for remove CCCamera.	2013-12-22 17:19:59 +08:00
.cproject	Adding missing eclipse project files	2013-03-07 12:13:50 -08:00
Android.mk	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss2171-new-renderer	2013-12-17 15:50:24 +08:00
CMakeLists.txt	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss2171-new-renderer	2013-12-17 15:50:24 +08:00