enable jscompile
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-console.git into develop
Now -j parameter also works in linux build
Merge branch 'develop' of http://github.com/lihex/cocos2d-console into develop
fix bug:cocos run -p linux

 ... ... 
 File "~/Cocos/cocos2d-x-3.0rc0/tools/cocos2d-console/bin/../plugins/project_compile/project_compile.py", line 36, in copy_files_in_dir
    os.makedirs(new_dst)
  File "/usr/lib/python2.7/os.py", line 157, in makedirs
    mkdir(name, mode)
OSError: [Errno 17] File exists:
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-console.git into develop
Zipalign the apk file generated with release mode.
Merge pull request #91 from lihex/develop

enable jscompile plugin
Merge pull request #92 from natural-law/issue4863

Zipalign the apk file generated with release mode.
Merge pull request #74 from randomize/add_jobs_in_linux

Now -j parameter also works in linux build
Fixed "depoly" typo.
Solve the problem when updating the build_cfg.json.
Merge pull request #95 from natural-law/develop

Solve the problem when updating the build_cfg.json.
Merge pull request #93 from bunnyhero/deploy-spelling-fix

Fixed "depoly" typo.
Merge pull request #77 from leafsoar/develop

fix bug:cocos run -p linux
Keep the exe files in output directory when compiling win32.
Merge pull request #96 from natural-law/develop

Keep the exe files in output directory when compiling win32.
Merge pull request #3 from cocos2d/develop

合并