Commit Graph

7 Commits

Author SHA1 Message Date
pandamicro fcbcce65d8 Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop
Conflicts:
	cocos/platform/android/CCDevice-android.cpp
	cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxBitmap.java
	cocos/platform/ios/CCDevice-ios.mm
	cocos/platform/mac/CCDevice-mac.mm
	cocos/platform/win32/CCDevice-win32.cpp
2016-08-31 14:39:08 +08:00
zilongshanren 299280cbe0 fix windows systemfont bold 2016-08-31 11:44:04 -07:00
pandamicro fe85f150d9 Upgrade cocos/platform to v3.13 2016-08-05 18:13:48 +08:00
WenhaiLin e31a6e6196 Fixed compile fail on window 2016-04-08 18:43:44 +08:00
Wenhai Lin 34939f30fd sync bug fix++ 2016-04-07 21:56:09 +08:00
Wenhai Lin 94c95d5838 Withespaces does matter. 2016-03-31 23:50:02 +08:00
Wenhai Lin a6dbf31dcf cocos 2d lite version 2016-03-29 17:55:48 +08:00