James Chen 1eadcd8b38 fixed #2301: Merge branch 'emscriptenate' of https://github.com/j4m3z0r/cocos2d-x into j4m3z0r-emscriptenate ... Conflicts: cocos2dx/proj.emscripten/cocos2dx.mk		2013-06-19 13:03:51 +08:00
..
Makefile	fixed #2301: Merge branch 'emscriptenate' of https://github.com/j4m3z0r/cocos2d-x into j4m3z0r-emscriptenate	2013-06-19 13:03:51 +08:00
index.html	Simple logging controls in testcpp index.html	2013-06-17 20:29:57 -07:00
main.cpp	Query the GL canvas for its width and height and use that rather than hardcoding it. Default the frame size to the whole canvas, and update the samples to use iPad resolution (1024x768).	2013-05-17 12:39:18 -07:00