samuelhu 3508213615 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj		2013-10-29 11:45:19 +08:00
..
Classes	closed #2517: Use LocalVarToAuto.py to change Samples src file	2013-08-16 16:05:27 +08:00
Resources	issue #3409:Add XMLHttpRequest lua binding and corresponding test sample	2013-10-29 11:40:41 +08:00
proj.android	Android: add xlargeScreens="true" to supports-screens	2013-10-28 23:12:51 +01:00
proj.ios	Removing unused ios projects.	2013-10-12 15:02:28 +08:00
proj.linux	issue #2905:samples build ok on linux	2013-10-22 18:01:56 +08:00
proj.mac	Icons for test projects	2013-10-16 11:55:14 -07:00
proj.win32	issue #2905:modification vs-project for folder structure change	2013-10-21 22:09:21 +08:00
.gitignore	issue #2103 add cocosbuilder lua test sample	2013-06-05 15:17:00 +08:00