axmol/tests/cpp-tests/Classes/Camera3DTest
Nite Luo 1c10ae43bc Merge branch 'v3' into renderFix
Conflicts:
	tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.cpp
	tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.h
2015-01-12 20:43:55 -08:00
..
Camera3DTest.cpp Merge branch 'v3' into renderFix 2015-01-12 20:43:55 -08:00
Camera3DTest.h Merge branch 'v3' into renderFix 2015-01-12 20:43:55 -08:00