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
..
cocos2d_libs.xcodeproj	[JSB] Fixing compilation errors for iOS and Mac projects.	2013-10-25 10:50:03 +08:00
cocos2d_samples.xcodeproj	issue #3409:Add XMLHttpRequest lua binding and corresponding test sample	2013-10-29 11:40:41 +08:00
Makefile	issue #2905:samples build ok on linux	2013-10-22 18:01:56 +08:00
cocos2d-win32.vc2012.sln	issue #2905:modification vs-project for folder structure change	2013-10-21 22:09:21 +08:00
install-deps-linux.sh	issue #2905:samples build ok on linux	2013-10-22 18:01:56 +08:00
make-all-linux-project.sh	issue #2905:adjust folder structure	2013-10-12 11:22:05 +08:00