James Chen d1ad635ad8 Merge pull request #4497 from zhiqiangxu/develop ... closed #3559: Useless conversion in ScrollView::onTouchBegan		2014-01-01 17:55:41 -08:00
..
GUI	Merge pull request #4497 from zhiqiangxu/develop	2014-01-01 17:55:41 -08:00
assets-manager	Fixes to asset manager in the MASTER branch	2013-12-17 20:09:21 +05:00
physics-nodes	issue #2171: Fixing compilation errors for Linux port.	2013-12-17 14:50:40 +08:00
proj.win32	issue #2790: Removes CCSort.h/.cpp from projects.	2013-12-07 14:21:01 +08:00
Android.mk	issue #2790: Removes CCSort.h/.cpp from projects.	2013-12-07 14:21:01 +08:00
CMakeLists.txt	issue #2790: Removes CCSort.h/.cpp from projects.	2013-12-07 14:21:01 +08:00
ExtensionMacros.h	issue #1483: Added LICENSE_CCControlExtension.txt, and added license information for headers of CCControlExtension.	2012-09-25 17:26:09 +08:00
cocos-ext.h	issue #2905: testcpp bild ok on Android	2013-10-15 18:00:03 +08:00