6 Commits

Author	SHA1	Message	Date
minggo	cd5bcb87af	issue #2284: merge master and fixed some conflicts	2013-06-13 17:54:05 +08:00
James Chen	d3253dd161	Fixing compilation errors for native client port.	2013-06-08 15:28:58 +08:00
flaming0	3daf21996c	Update for spine runtime ... Conflicts: extensions/proj.win32/libExtensions.vcxproj extensions/proj.win32/libExtensions.vcxproj.filters	2013-06-04 14:46:31 +08:00
flaming0	5f1a4a4be7	Update for spine runtime	2013-06-02 18:26:46 +04:00
Sam Clegg	924d271410	Fix warnings.	2013-04-29 16:46:48 -07:00
James Chen	2d1172814d	issue #2075: Adding spine editor support. Adding a new test 'SpineTest' in TestCpp, adding the parse code in "extensions/spine". It works only on iOS now.	2013-04-24 13:57:34 +08:00