Ricardo Quesada c386f88e32 Merge branch 'develop' into visit_draw_improved ... Conflicts: CHANGELOG cocos/gui/UILayout.h		2014-03-03 11:27:42 -08:00
..
TriggerCode	issue #4165: Scheduler::scheduleCallback -> Scheduler::schedule, Scheduler::scheduleSelector -> Scheduler::schedule. APIs are clear for c++ developers now.	2014-03-03 11:00:30 +08:00
SceneEditorTest.cpp	Cache working OK.	2014-02-28 16:10:48 -08:00
SceneEditorTest.h	Cache working OK.	2014-02-28 16:10:48 -08:00