CaiWenzhi 7a207431cd Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch ... Conflicts: cocos/gui/UIHelper.h		2013-11-06 16:13:10 +08:00
..
.externalToolBuilders	Adding missing eclipse project files	2013-03-07 12:13:50 -08:00
Classes	Merge master branch to develop branch	2013-11-06 16:04:06 +08:00
Resources	[cmake] Deletes .icf files.	2013-11-04 21:03:09 +08:00
proj.android	closed #3108: add -fsigned-char to make char to signed as default	2013-11-04 10:48:45 +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	Merge folder changes from develop	2013-10-30 23:19:36 -07:00
.cproject	Adding missing eclipse project files	2013-03-07 12:13:50 -08:00
Android.mk	Fix android build after adding MouseEvent and MouseTest	2013-10-31 00:40:38 -07:00
CMakeLists.txt	issue #3113: Updating CMakeLists.txt, Improve Copying files.	2013-11-06 10:57:36 +08:00