108 Commits

Author	SHA1	Message	Date
CaiWenzhi	c69163559b	Move some method from helper to reader	2013-11-07 21:26:56 +08:00
CaiWenzhi	af5ab02bc7	temp commit	2013-11-07 14:00:51 +08:00
CaiWenzhi	e765eb1e7a	Test commit	2013-11-06 18:30:09 +08:00
CaiWenzhi	12570b5e8f	temp commit	2013-11-06 16:20:01 +08:00
CaiWenzhi	7a207431cd	Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch ... Conflicts: cocos/gui/UIHelper.h	2013-11-06 16:13:10 +08:00
CaiWenzhi	e0aa82da13	Merge master branch to develop branch	2013-11-06 16:04:06 +08:00
Ricardo Quesada	84a6aa29cd	Adds more 64-bit fixes ... Replaces more `int` with `long` where it makes sense. Also , it repalces some `unsigned long` with `long` for "lenght" values as described in our c++ guideline	2013-11-05 17:36:44 -08:00
minggo	8f7a489a4d	issue #2905:make cocostudio and gui flat	2013-10-16 16:48:39 +08:00