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
..
cpp-empty-test	Squashed commit of the following:	2014-05-18 14:49:16 -07:00
cpp-tests	Merge branch 'v3' into 5176	2014-05-26 14:00:23 +08:00
lua-empty-test	Squashed commit of the following:	2014-05-16 14:36:00 -07:00
lua-tests	Update the openGL lua binding and related test case	2014-05-23 19:12:30 +08:00