no message
no message
Merge branch 'branch_MaGuoYang' of https://git.oschina.net/9miao/CrossApp into branch_MaGuoYang
Merge remote-tracking branch 'origin/branch_Liyuanfeng' into branch_MaGuoYang
字体间添加固定间距
 添加文字风格配置读取接口
Merge remote-tracking branch 'origin/branch_zhujnt' into branch_MaGuoYang

Conflicts:
	extensions/proj.win32/libExtensions.vcxproj.filters
Merge branch 'branch_MaGuoYang' of https://git.oschina.net/9miao/CrossApp into branch_MaGuoYang
no message
Merge commit '3b89b303ffaef69111f9847321015304f46be188' into branch_Liyuanfeng
Merge commit 'e6aac20f68124e15be73d9554392ddb7c673312b' into branch_Liyuanfeng

Conflicts:
	README.md
Merge branch 'branch_MaGuoYang' of https://git.oschina.net/9miao/CrossApp into branch_MaGuoYang
labStyle代码整理
优化文字切割接口
字体布局
no message
Merge commit '647940a1fbac597e221ac43df6909e866e3839d6' into branch_Liyuanfeng

Conflicts:
	CrossApp/proj.mac/CrossApp.xcodeproj/project.pbxproj
	extensions/GUI/CAUIHelper.cpp
间距
Merge commit '785422bcc0d6e4fa7f3dbb1a7d13f46c6c24a98e' into branch_Liyuanfeng

Conflicts:
	samples/demo/Classes/LabelTest/LabelTest.cpp
Merge commit '4b33357c94f1667ad58ac333cb0c8083ce60cc21' into branch_Liyuanfeng