Added rotationIsDir to Particle System. It sets the rotation of each particle to its direction
Added test for rotation is dir in particle system
Fixed syntax, integrated lines.png and lines.plist
CCLens3d can be concave

added boolean operator to enable the lens to be concave as well as
convex
issue #1725 project creator script works ok for iOS and Android on Mac OSX env
Merge branch 'refs/heads/master' into project-creator
issue #1725, improve the project creator on android
issue #1725, project-creator, HelloJavascript on win32 works ok
Updated the submodule of cxx-generator.
Merge pull request #1995 from dumganhar/master

Updated the submodule of cxx-generator.
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
Merge pull request #1996 from CocosRobot/updategeneratedsubmodule_1361239496

cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
Merge pull request #1997 from minggo/iss1731-lua-declaration

issue #1731:change CCSize, CCPoint and CCRect to struct in pkg files
issue #1724: Adding solution for HelloJavascript.
Merge pull request #1998 from dumganhar/iss1724-hellojs

issue #1724: Adding vs solution for HelloJavascript.
changed fileformat of list.sh to unix

list.sh doesn't work in linux/mac due to its fileformat
CCBReader error with generated animations


synchronous with cocos2d-iPhone
Merge pull request #2001 from hailongiPhone/master

Synchronizing with cocos2d-iPhone for CCBReader.
Merge pull request #1999 from walzer/project-creator

issue #1733: python scripts for generating JSB projects.
Merge branch 'master' of https://github.com/mutoo/cocos2d-x into mutoo-master