yangxiao 9b117bf87c resolve conflict		2015-02-13 15:46:19 +08:00
..
cpp-empty-test	fix libpng warning	2014-12-27 20:47:59 +08:00
cpp-tests	resolve conflict	2015-02-13 15:46:19 +08:00
game-controller-test	Fixed compiling and linking error of lua tests when using NDK r10 above.	2014-11-27 13:56:15 +08:00
lua-empty-test	Remove useless copy about luasocket on the android platform	2014-12-05 15:28:45 +08:00
lua-game-controller-test	Fixed compiling and linking error of lua tests when using NDK r10 above.	2014-11-27 13:56:15 +08:00
lua-tests	Fix z-fighting error by using setDepthTest of cc.Director	2015-01-30 11:03:47 +08:00