9 Commits

Author	SHA1	Message	Date
YuLei Liao	a1f8433a47	* fix merge error 4	2011-11-21 18:50:19 +08:00
YuLei Liao	012ce7a04f	* fix merge error 1	2011-11-21 17:00:56 +08:00
YuLei Liao	7a6253d9aa	* merge cocos2d-1.0.1-x-0.9.2-luafix to master	2011-11-21 16:38:00 +08:00
YuLei Liao	09d12be875	* format cocos2d-x source files	2011-11-18 21:23:54 +08:00
Leon	785b79d263	fix compile errors under ubuntu 11.10	2011-10-31 23:50:08 -07:00
Walzer	348a05a329	fix a typo, CCObject::m_uRefrence -> CCObject::m_uReference	2011-07-07 08:23:31 +08:00
liswei	1591c7edc8	fixed #512 fix warnings in /Wall flag	2011-06-10 17:51:37 +08:00
minggo	47173778cc	fixed #409: rename NSArray UIAlignment	2011-03-18 14:31:29 +08:00
minggo	b5a99f90df	issue #375: rename file names and object names	2011-03-07 17:11:57 +08:00