Conflicts:
	src/Test Fonts/WorkSans-Black.otf
	src/Test Fonts/WorkSans-Bold.otf
	src/Test Fonts/WorkSans-Extrabold.otf
	src/Test Fonts/WorkSans-Extralight.otf
	src/Test Fonts/WorkSans-Light.otf
	src/Test Fonts/WorkSans-Medium.otf
	src/Test Fonts/WorkSans-Regular.otf
	src/Test Fonts/WorkSans-Semibold.otf
	src/Test Fonts/WorkSans-Thin.otf
	src/Test Fonts/worksans-black-webfont.woff2
	src/Test Fonts/worksans-bold-webfont.woff2
	src/Test Fonts/worksans-extrabold-webfont.woff2
	src/Test Fonts/worksans-extralight-webfont.woff2
	src/Test Fonts/worksans-light-webfont.woff2
	src/Test Fonts/worksans-medium-webfont.woff2
	src/Test Fonts/worksans-regular-webfont.woff2
	src/Test Fonts/worksans-semibold-webfont.woff2
	src/Test Fonts/worksans-thin-webfont.woff2
	src/Work Sans-Telugu.glyphs
	src/Work Sans.glyphs
This commit is contained in:
Wei Huang 2014-12-10 16:49:41 +01:00
commit 0157db3e2b
20 changed files with 21297 additions and 19590 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff