andyque ef5d4ddf86 Merge remote-tracking branch 'upstream/v3' into v3 ... # Conflicts: # tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters		2015-07-14 11:24:38 +08:00
..
compat	Squashed commit of the following:	2014-05-16 14:36:00 -07:00
CCApplication-win32.cpp	Refine setAnimationInterval from double to float.	2015-07-06 14:57:42 +08:00
CCApplication-win32.h	Refine setAnimationInterval from double to float.	2015-07-06 14:57:42 +08:00
CCCommon-win32.cpp	Compiles on Android	2014-09-09 17:53:08 -07:00
CCDevice-win32.cpp	Merged changes from "Vibrate support in v4" into v3 branch.	2015-06-26 01:02:44 +02:00
CCFileUtils-win32.cpp	Merge remote-tracking branch 'upstream/v3' into v3	2015-07-14 11:24:38 +08:00
CCFileUtils-win32.h	Merge pr11866: FileUtilsWin32 correct use all unicode version winapi.	2015-07-13 17:06:01 +08:00
CCGL-win32.h	Compiles on Android	2014-09-09 17:53:08 -07:00
CCPlatformDefine-win32.h	add vs2015 support	2015-05-21 13:55:01 +08:00
CCStdC-win32.cpp	Compiles on Android	2014-09-09 17:53:08 -07:00
CCStdC-win32.h	Add support for visual studio 2015.	2015-05-12 16:26:28 +08:00
inet_pton_mingw.cpp	MinGW build fix	2015-03-05 11:11:13 +03:00
inet_pton_mingw.h	MinGW build fix	2015-03-05 11:11:13 +03:00