axmol/samples/Javascript/TestJavascript/proj.win32
James Chen f2f3aa55bf Merge branch 'gles20' of https://github.com/johnangel/cocos2d-x into iss-vs2012
Conflicts:
	samples/Cpp/HelloCpp/proj.win32/HelloCpp.vcxproj
	samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj
	samples/Javascript/CocosDragonJS/proj.win32/CocosDragonJS.vcxproj
	samples/Javascript/MoonWarriors/proj.win32/MoonWarriors.vcxproj
	samples/Javascript/TestJavascript/proj.win32/TestJavascript.vcxproj
	samples/Javascript/WatermelonWithMe/proj.win32/WatermelonWithMe.vcxproj
	samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj
	samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj
	scripting/javascript/bindings/generated
	scripting/lua/proj.win32/liblua.vcxproj
2012-12-29 09:48:22 +08:00
..
res issue #1603:adjust samples directory 2012-12-20 14:14:53 +08:00
TestJavascript.vcxproj Merge branch 'gles20' of https://github.com/johnangel/cocos2d-x into iss-vs2012 2012-12-29 09:48:22 +08:00
TestJavascript.vcxproj.filters issue #1603: Added libJSBinding project for win32 platform. 2012-12-20 17:18:02 +08:00
TestJavascript.vcxproj.user issue #1603:adjust samples directory 2012-12-20 14:14:53 +08:00
main.cpp issue #1603:adjust samples directory 2012-12-20 14:14:53 +08:00
main.h issue #1603:adjust samples directory 2012-12-20 14:14:53 +08:00
resource.h issue #1603:adjust samples directory 2012-12-20 14:14:53 +08:00
testjs.rc issue #1603:adjust samples directory 2012-12-20 14:14:53 +08:00