4 Commits

Author	SHA1	Message	Date
James Chen	6dcaca78d0	[jsoncpp] Value::null -> Value::jsonNull to avoid conflict when compiling with clang++ or high version of gcc since null is defined as a key word.	2013-06-09 18:56:22 +08:00
James Chen	13dd26c85b	[BB] Fixing compilation errors for CocoStudio runtime.	2013-06-09 15:29:51 +08:00
James Chen	56f5e9ca32	Changing namespace Json to CSJson to avoid conflicts.	2013-06-09 10:50:03 +08:00
yinkaile	245b0395b1	1.upload CCArmature	2013-06-06 12:02:54 +08:00