minggo 8b5068d4c5 Merge pull request #4273 from boyu0/fix_ccbreader_magic_bits_compare_bug ... [ci skip]fix CCBReader magic bytes compare bug.		2013-11-14 23:45:33 -08:00
..
2d	Merge branch 'develop' into free_instead_of_delete	2013-11-15 09:44:29 +08:00
audio	Adds markdown comments in the doxstrings	2013-11-11 20:21:01 -08:00
base	replaces `delete[]` with `free()` in C-based API	2013-11-11 18:09:47 -08:00
editor-support	fix CCBReader magic bytes compare bug which cause CocosBuilderTest turns black	2013-11-15 15:41:43 +08:00
gui	Modify relative layout	2013-11-15 14:37:34 +08:00
math/kazmath	Merge branch 'develop' into arm64	2013-11-04 15:02:35 -08:00
network	remove makefiles	2013-11-11 17:29:48 +08:00
physics	issue #2770: fix some warning	2013-11-13 11:22:34 +08:00
scripting	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS	2013-11-15 13:49:19 +08:00
storage/local-storage	perfect vs-project configuration	2013-10-31 10:51:38 +08:00