fix tolua_fix, cleanup peertable after object deleted
android & ios screen size change support
config android_mk_generator
replace os.path.samefile

os.path.samefile not work at windows.
add some options

Usage: android_mk_generator.py [options]

Options:
-h, --help            show this help message and exit
-c CONFIG, --config=CONFIG
config file path.
-r ROOTPATH, --rootpath=ROOTPATH
class root path for mkfile, pathes, exclude.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
added | operator for Control::EventType
add Sprite::setScale(float, float)
ignore output files from script make-all-linux-project.sh
issue #2868:Config cocoStudio GUI lua binding files and add a few script files
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
temp commit
Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
fix Accelerometer Test with missing: Device::setAccelerometerEnabled(true);
add "retain" to listeners
fix indention
Fixed crash
fix compiling erros on Android
Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch