zhangbin ec62f05b12 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3		2014-06-20 10:51:13 +08:00
..
android	Squashed commit of the following:	2014-05-16 14:36:00 -07:00
include	add copyrights for 2014, in folders other then 2d.	2014-01-07 11:47:11 +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	Optimize the win32 projects configuration.	2014-06-20 10:50:43 +08:00
proj.wp8	added wp8 and winrt support files and projects	2014-03-28 12:53:35 -07:00
win32	Fix mingw64 build: convert from LPVOID to DWORD losses precision on 64-bit platform.	2014-05-28 12:37:35 +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
CMakeLists.txt	adding headers in src files so they appear in IDE	2014-05-10 10:03:46 +09:00