Commit Graph

6 Commits

Author SHA1 Message Date
James Chen dd2b15cba0 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1564-update-tests
Conflicts:
	samples/TestCpp/Classes/tests.h
2012-11-21 15:27:47 +08:00
minggo 5a4da366ed issue #1564:update DrawPrimitivesTest 2012-11-21 11:43:08 +08:00
minggo fce5b79a09 issue #1564:update SpriteTest 2012-11-20 15:19:57 +08:00
James Chen af36ada6e4 issue #1555: Enabled point size in DrawPrimitivesTest.cpp. 2012-11-19 17:16:45 +08:00
James Chen 62f7b25df2 issue #1521: Using relative coordinates in TestCpp. 2012-10-23 17:48:50 +08:00
James Chen 77f1fba566 issue #1399: Adjust folder structure, made it built successfully on win32. 2012-07-20 14:05:52 +08:00