Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/tests/cpp-tests
History
andyque 40f2128acd Merge branch 'v3' into 5176 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/ui/UIPageView.cpp
	cocos/ui/UIScrollView.cpp
	cocos/ui/UIScrollView.h
 		2014-05-26 14:00:23 +08:00
..
Classes Merge branch 'v3' into 5176 2014-05-26 14:00:23 +08:00
Resources Roll back test_image_ar.pvr 2014-05-23 17:19:39 +08:00
proj.android Squashed commit of the following: 2014-05-16 14:36:00 -07:00
proj.ios Fixes compiler warnings for mac and ios 2014-05-22 16:34:16 -03:00
proj.linux Renames 'samples' folder to 'tests', ouch.... 2014-03-11 19:10:34 +08:00
proj.mac issue #4674: Re-added deleted source files. 2014-05-04 14:37:55 +08:00
proj.win32 Squashed commit of the following: 2014-05-18 14:49:16 -07:00
proj.wp8-xaml Squashed commit of the following: 2014-05-18 14:49:16 -07:00
.cocos-project.json issue #4674: Re-added deleted source files. 2014-05-04 14:37:55 +08:00
Android.mk Squashed commit of the following: 2014-05-18 14:49:16 -07:00
CMakeLists.txt Squashed commit of the following: 2014-05-18 14:49:16 -07:00