6 Commits

Author	SHA1	Message	Date
YuLei Liao	4bf68e79fd	* merge upstream/master to master	2011-11-29 19:56:20 +08:00
minggo	f0d22ae504	issue #879: replase assert with CCAssert	2011-11-28 17:28:43 +08:00
YuLei Liao	09d12be875	* format cocos2d-x source files	2011-11-18 21:23:54 +08:00
walzer	81fa070125	fixed #418, add copyright of original authors, merge Bin's commit	2011-03-19 14:45:51 +08:00
walzer	abd2725ed4	issue #148, add copyright	2011-03-19 10:34:26 +08:00
minggo	7d39629c8c	issue #400: rename CCamera.cpp to CCCamera.cpp	2011-03-18 14:54:03 +08:00