natural-law 1991a65b0b Merge branch 'master' into iss391 ... Conflicts: HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj cocos2dx/proj.win32/cocos2d-win32.vcproj cocos2dx/proj.wophone/Makefile.ARM cocos2dx/proj.wophone/cocos2d-wophone.vcproj template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj tests/test.ios/test.xcodeproj/project.pbxproj		2011-03-29 10:20:57 +08:00
..
Resource	[airplay] first commit of airplay port. Thanks for Аксёнов Максим's contribution!	2011-03-23 22:16:20 +08:00
airplay	[airplay] issue #379, fix search header paths with cause compilation error on release build	2011-03-24 10:19:52 +08:00
android	[android] HelloWorld supports cocosdenshion	2011-03-18 11:01:27 +08:00
ios	Merge branch 'master' into iss391	2011-03-29 10:20:57 +08:00
win32	Add VC2010 project files on win32	2011-03-10 19:50:17 +08:00
wophone	[wophone]fixed #386,Resolve the compile conflict on wophone sdk.Modify the makefiles for wophone.	2011-03-10 14:24:13 +08:00
AppDelegate.cpp	fixed #395 Add initInstance code for all platform in msvc templates.	2011-03-17 11:27:51 +08:00
AppDelegate.h	issue #375: rename file names and object names	2011-03-07 17:11:57 +08:00
HelloWorldScene.cpp	[ios] HelloWorld.jpg ->.png, xcode project from iOS4.1 to 4.2 "Lastest iOS"	2011-03-14 18:31:16 +08:00
HelloWorldScene.h	issue #375: rename file names and object names	2011-03-07 17:11:57 +08:00