samuele3hu 74624f5ba1 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module		2014-08-25 11:52:52 +08:00
..
android	fix compiling warnings	2014-07-03 11:43:56 +08:00
include	WP8 compile fix	2014-08-07 11:56:28 +08:00
ios	compiles on iOS	2014-04-30 19:21:10 -07:00
linux	Squashed commit of the following:	2014-04-30 19:09:13 -07:00
mac	Add new line at the end of a file to *.mm	2014-06-19 20:48:50 +09:00
openal	Update SimpleAudioEngineOpenAL.cpp	2014-04-10 01:00:23 +03:00
proj.win32	Integrate libcocosdenshion,libcocos3d,libnetwork,libcocostudio and libextension into cocos2d on the iOS/Mac platform	2014-08-22 13:49:21 +08:00
proj.wp8	added wp8 and winrt support files and projects	2014-03-28 12:53:35 -07:00
win32	Modify MciPlayer.cpp to support Unicode	2014-08-22 13:41:48 +08:00
winrt	Add new line at the end of a file to *.h	2014-06-19 20:45:49 +09:00
wp8	Add new line at the end of a file to *.h	2014-06-19 20:45:49 +09:00