johnangel a1155f52e6 Merge remote branch 'upstream/gles20' into gles20		2013-01-11 21:48:47 +01:00
..
cxx-generator@ab8a6c0823	fix a type information in CCBAnimationManager	2012-12-10 11:30:07 +08:00
jenkins_scripts	issue #1603:delete space when setting language	2012-12-26 10:42:35 +08:00
lua_project_generator	Detect VS2012 Update 1	2013-01-10 11:55:30 +01:00
tojs	Update tools/tojs/README.mdown	2013-01-06 18:31:35 +08:00
tolua++	[luabinding] add CCDirector::setDisplayStats()	2012-12-29 11:16:07 +08:00
xcode4_template_generator	fixed #1645: Excluded proj.win32.	2013-01-08 15:15:44 +08:00