Merge pull request #2 from cocos2d/master

update cocos2d/cocos2d-x
Merge pull request #3 from cocos2d/master

merge from cocos2d-x
fix CCScale9Sprite bugs when parsing rotated spriteframe from plist file that texture packer generate.
Merge pull request #3 from cocos2d/master

update cocos2d/cocos2d-x
[Linux] add cache for font family -> font path mapping

As FcFontMach is quite an expensive call the results of getFontFile() are
now cached in an std::map if either a ttf file is packed with the app or
if a font file has been found by using fontconfig
fix: can't generate CCNode.h's document with doxygen 1.8.3
Merge pull request #4 from cocos2d/master

update cocos2d/cocos2d-x
[Linux] fixed font rendering artifacts, added simple line break

This patch fixed the size calculations for true type fonts (especially for
italic fonts)
Additinally a very simple greedy line break algorithm has been added for
true type labels.
Merge pull request #2154 from jedy/fix_ccnode_doc

fix: can't generate CCNode.h's document with doxygen 1.8.3
Update AUTHORS
Merge pull request #2167 from Weeds/feature-linux-fontdimensions

fixed #1834: [Linux] fixed font rendering artifacts, added simple line break.
This patch fixed the size calculations for true type fonts (especially for
italic fonts)
Additinally a very simple greedy line break algorithm has been added for
true type labels.
Update AUTHORS
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
Merge pull request #2168 from CocosRobot/updategeneratedsubmodule_1363318521

cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
Uncommenting jsb_CCEditBox_prototype, updating the submodule of cxx-generator to the latest one.
Merge pull request #2169 from dumganhar/master

Updating the submodule of cxx-generator to the latest one.
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
Merge pull request #2170 from CocosRobot/updategeneratedsubmodule_1363319835

cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
Merge branch 'master' into feature-linux-fontcache
Updating VS2012 solution, CystalCraze project depends on libJSBinding and libExtensions.