pandamicro 85e8a407b1 Merge branch 'navmesh' of https://github.com/jianglong0156/cocos2d-x into v3 ... # Conflicts: # tests/js-tests/project/Classes/AppDelegate.cpp # tools/tojs/genbindings.py		2015-06-17 19:58:24 +08:00
..
Classes	Merge branch 'navmesh' of https://github.com/jianglong0156/cocos2d-x into v3	2015-06-17 19:58:24 +08:00
proj.android	modify android res copy	2015-06-15 09:55:10 +08:00
proj.android-studio	modify android res copy	2015-06-15 09:55:10 +08:00
proj.ios	Add js-tests	2015-04-16 18:07:35 +08:00
proj.linux	Add js-tests	2015-04-16 18:07:35 +08:00
proj.mac	Add js-tests	2015-04-16 18:07:35 +08:00
proj.win8.1-universal	added missing librecast	2015-06-15 20:06:54 -07:00
proj.win32	add navmesh test project file and binding file	2015-06-17 18:37:19 +08:00
CMakeLists.txt	copy resources in linux	2015-05-26 16:34:04 +08:00