axmol/tests/test-cpp
Ricardo Quesada 9d5393631c Merge branch 'develop' into fast_tmx
Conflicts:
	tests/test-cpp/Classes/ConsoleTest/ConsoleTest.cpp
	tests/test-cpp/Classes/VisibleRect.cpp
2014-02-08 12:49:56 -08:00
..
Classes Merge branch 'develop' into fast_tmx 2014-02-08 12:49:56 -08:00
Resources samples -> tests 2014-01-31 14:09:28 -08:00
proj.android samples -> tests 2014-01-31 14:09:28 -08:00
proj.ios samples -> tests 2014-01-31 14:09:28 -08:00
proj.linux samples -> tests 2014-01-31 14:09:28 -08:00
proj.mac samples -> tests 2014-01-31 14:09:28 -08:00
proj.win32 samples -> tests 2014-01-31 14:09:28 -08:00
Android.mk samples -> tests 2014-01-31 14:09:28 -08:00
CMakeLists.txt samples -> tests 2014-01-31 14:09:28 -08:00