Commit Graph

2 Commits

Author SHA1 Message Date
zhangbin e02f488224 Merge branch 'develop' into issue3964 2014-02-16 11:01:07 +08:00
Dhilan007 0d5c702708 move labelttf's platform-dependent code from CCImage to CCDevice 2014-02-13 21:08:43 +08:00