Merge develop to master#1145
Merged
dingpinglv merged 254 commits intococos2d:masterfrom Sep 17, 2013
Commits
This pull request is big! We're only showing the most recent 250 commits
Commits on Jul 25, 2013
Commits on Jul 29, 2013
Commits on Jul 30, 2013
Commits on Jul 31, 2013
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
SeanLin - committedSeanLin
- committed
Commits on Aug 1, 2013
- committed
- committed
- committed
- committed
- committed
Commits on Aug 2, 2013
- committed
- committed
- committed
- committed
Commits on Aug 3, 2013
- committedSeanLin
Commits on Aug 5, 2013
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
Commits on Aug 7, 2013
- committed
- committed
- committed
- committed
- committed
Commits on Aug 8, 2013
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
Commits on Aug 9, 2013
- committed
- committed
- committed
- committed
Commits on Aug 15, 2013
Commits on Aug 16, 2013
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
Commits on Aug 18, 2013
Commits on Aug 19, 2013
- committed
- committed
- committedWanderWang
- committed
- committed
Commits on Aug 20, 2013
- committed
- committedWanderWang
- committed
- committed
- committed
Commits on Aug 21, 2013
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
Commits on Aug 22, 2013
- committed
- committed
- committed
- committed
Commits on Aug 23, 2013
Commits on Aug 26, 2013
- committed
- committed
- committedWanderWang
Commits on Aug 27, 2013
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
Commits on Aug 28, 2013
Commits on Aug 29, 2013
- committed
- committed
- committed
- committed
Commits on Sep 1, 2013
- committed
- committedWanderWang
- committedWanderWang
Commits on Sep 2, 2013
- committed
- committed
- committedguozhuc
- committedWanderWang
Commits on Sep 3, 2013
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
Commits on Sep 4, 2013
Commits on Sep 5, 2013
- committed
- committed
- committed
Commits on Sep 9, 2013
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
Commits on Sep 10, 2013
- committed
- committed
- committed
- committed
- committed
Commits on Sep 11, 2013
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
Commits on Sep 12, 2013
- committed
- committed
- committed
- committed
- committed
- committed
fixed #2801: add setFontName/setFontSize/setPlaceholderFontName/setPlaceholderFontSize for EditBox .
committed- committed
- committed
- committed
- committed
Commits on Sep 13, 2013
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
Commits on Sep 14, 2013
Commits on Sep 16, 2013
- committed
- committed
- committed
- committedSeanLin
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committedWanderWang
- committedWanderWang
Commits on Sep 17, 2013
- committedWanderWang
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed