James Chen 72c2d4ca35 Merge branch 'develop' into 2youyouo2-develop ... Conflicts: extensions/proj.win32/libExtensions.vcxproj.filters		2013-09-16 20:12:03 +08:00
..
Cpp	[Armature] Fixing compilation errors.	2013-09-16 19:27:34 +08:00
Javascript	upstream synchronize	2013-09-16 19:46:14 +08:00
Lua	Merge pull request #3596 from dumganhar/new-event-dispatcher-rename	2013-09-15 20:13:51 -07:00
samples.xcodeproj	Adding NewEventDispatcher Test.	2013-09-13 16:38:21 +08:00