diff options
author | nicolas <nclm@users.noreply.github.com> | 2015-09-10 22:31:29 +0200 |
---|---|---|
committer | nicolas <nclm@users.noreply.github.com> | 2015-09-10 22:31:29 +0200 |
commit | 6f1ce7cbd393c9027cafde92886c852b8ec8a97e (patch) | |
tree | 2ae591b041780086b33b888f70eb76152d82d4c3 /webfontkit | |
parent | c0bbf31fcd84da22c57059d0480532f9f12e2e5d (diff) | |
parent | fec35d1165affeab2361da0c08a6dc7fd8c654f6 (diff) |
Merge remote-tracking branch 'ms-studio/master'
Diffstat (limited to 'webfontkit')
34 files changed, 0 insertions, 0 deletions
diff --git a/webfontkit/Karmilla-012/generator_config.txt b/webfontkit/Karmilla-012/generator_config.txt index ada05f1..ada05f1 100644..100755 --- a/webfontkit/Karmilla-012/generator_config.txt +++ b/webfontkit/Karmilla-012/generator_config.txt diff --git a/webfontkit/Karmilla-012/karmilla-bold-012-demo.html b/webfontkit/Karmilla-012/karmilla-bold-012-demo.html index fe46b9c..fe46b9c 100644..100755 --- a/webfontkit/Karmilla-012/karmilla-bold-012-demo.html +++ b/webfontkit/Karmilla-012/karmilla-bold-012-demo.html diff --git a/webfontkit/Karmilla-012/karmilla-bold-012-webfont.eot b/webfontkit/Karmilla-012/karmilla-bold-012-webfont.eot Binary files differindex f3be51e..f3be51e 100644..100755 --- a/webfontkit/Karmilla-012/karmilla-bold-012-webfont.eot +++ b/webfontkit/Karmilla-012/karmilla-bold-012-webfont.eot diff --git a/webfontkit/Karmilla-012/karmilla-bold-012-webfont.svg b/webfontkit/Karmilla-012/karmilla-bold-012-webfont.svg index 4b00b3f..4b00b3f 100644..100755 --- a/webfontkit/Karmilla-012/karmilla-bold-012-webfont.svg +++ b/webfontkit/Karmilla-012/karmilla-bold-012-webfont.svg diff --git a/webfontkit/Karmilla-012/karmilla-bold-012-webfont.ttf b/webfontkit/Karmilla-012/karmilla-bold-012-webfont.ttf Binary files differindex 5a7cfad..5a7cfad 100644..100755 --- a/webfontkit/Karmilla-012/karmilla-bold-012-webfont.ttf +++ b/webfontkit/Karmilla-012/karmilla-bold-012-webfont.ttf diff --git a/webfontkit/Karmilla-012/karmilla-bold-012-webfont.woff b/webfontkit/Karmilla-012/karmilla-bold-012-webfont.woff Binary files differindex 97c1b57..97c1b57 100644..100755 --- a/webfontkit/Karmilla-012/karmilla-bold-012-webfont.woff +++ b/webfontkit/Karmilla-012/karmilla-bold-012-webfont.woff diff --git a/webfontkit/Karmilla-012/karmilla-regular-012-demo.html b/webfontkit/Karmilla-012/karmilla-regular-012-demo.html index 8b1e55b..8b1e55b 100644..100755 --- a/webfontkit/Karmilla-012/karmilla-regular-012-demo.html +++ b/webfontkit/Karmilla-012/karmilla-regular-012-demo.html diff --git a/webfontkit/Karmilla-012/karmilla-regular-012-webfont.eot b/webfontkit/Karmilla-012/karmilla-regular-012-webfont.eot Binary files differindex caec36a..caec36a 100644..100755 --- a/webfontkit/Karmilla-012/karmilla-regular-012-webfont.eot +++ b/webfontkit/Karmilla-012/karmilla-regular-012-webfont.eot diff --git a/webfontkit/Karmilla-012/karmilla-regular-012-webfont.svg b/webfontkit/Karmilla-012/karmilla-regular-012-webfont.svg index 4eaf86f..4eaf86f 100644..100755 --- a/webfontkit/Karmilla-012/karmilla-regular-012-webfont.svg +++ b/webfontkit/Karmilla-012/karmilla-regular-012-webfont.svg diff --git a/webfontkit/Karmilla-012/karmilla-regular-012-webfont.ttf b/webfontkit/Karmilla-012/karmilla-regular-012-webfont.ttf Binary files differindex 98030d2..98030d2 100644..100755 --- a/webfontkit/Karmilla-012/karmilla-regular-012-webfont.ttf +++ b/webfontkit/Karmilla-012/karmilla-regular-012-webfont.ttf diff --git a/webfontkit/Karmilla-012/karmilla-regular-012-webfont.woff b/webfontkit/Karmilla-012/karmilla-regular-012-webfont.woff Binary files differindex fbdda19..fbdda19 100644..100755 --- a/webfontkit/Karmilla-012/karmilla-regular-012-webfont.woff +++ b/webfontkit/Karmilla-012/karmilla-regular-012-webfont.woff diff --git a/webfontkit/Karmilla-012/specimen_files/easytabs.js b/webfontkit/Karmilla-012/specimen_files/easytabs.js index 167f53b..167f53b 100644..100755 --- a/webfontkit/Karmilla-012/specimen_files/easytabs.js +++ b/webfontkit/Karmilla-012/specimen_files/easytabs.js diff --git a/webfontkit/Karmilla-012/specimen_files/grid_12-825-55-15.css b/webfontkit/Karmilla-012/specimen_files/grid_12-825-55-15.css index 3d6aef7..3d6aef7 100644..100755 --- a/webfontkit/Karmilla-012/specimen_files/grid_12-825-55-15.css +++ b/webfontkit/Karmilla-012/specimen_files/grid_12-825-55-15.css diff --git a/webfontkit/Karmilla-012/specimen_files/karmilla-bold-012-cleartype.png b/webfontkit/Karmilla-012/specimen_files/karmilla-bold-012-cleartype.png Binary files differindex c7a9005..c7a9005 100644..100755 --- a/webfontkit/Karmilla-012/specimen_files/karmilla-bold-012-cleartype.png +++ b/webfontkit/Karmilla-012/specimen_files/karmilla-bold-012-cleartype.png diff --git a/webfontkit/Karmilla-012/specimen_files/karmilla-regular-012-cleartype.png b/webfontkit/Karmilla-012/specimen_files/karmilla-regular-012-cleartype.png Binary files differindex 93ab729..93ab729 100644..100755 --- a/webfontkit/Karmilla-012/specimen_files/karmilla-regular-012-cleartype.png +++ b/webfontkit/Karmilla-012/specimen_files/karmilla-regular-012-cleartype.png diff --git a/webfontkit/Karmilla-012/specimen_files/specimen_stylesheet.css b/webfontkit/Karmilla-012/specimen_files/specimen_stylesheet.css index aecc43c..aecc43c 100644..100755 --- a/webfontkit/Karmilla-012/specimen_files/specimen_stylesheet.css +++ b/webfontkit/Karmilla-012/specimen_files/specimen_stylesheet.css diff --git a/webfontkit/Karmilla-012/stylesheet.css b/webfontkit/Karmilla-012/stylesheet.css index e70906b..e70906b 100644..100755 --- a/webfontkit/Karmilla-012/stylesheet.css +++ b/webfontkit/Karmilla-012/stylesheet.css diff --git a/webfontkit/Karmilla-v-011/generator_config.txt b/webfontkit/Karmilla-v-011/generator_config.txt index 33c1f13..33c1f13 100644..100755 --- a/webfontkit/Karmilla-v-011/generator_config.txt +++ b/webfontkit/Karmilla-v-011/generator_config.txt diff --git a/webfontkit/Karmilla-v-011/karmilla-bold-011-demo.html b/webfontkit/Karmilla-v-011/karmilla-bold-011-demo.html index 99d96bf..99d96bf 100644..100755 --- a/webfontkit/Karmilla-v-011/karmilla-bold-011-demo.html +++ b/webfontkit/Karmilla-v-011/karmilla-bold-011-demo.html diff --git a/webfontkit/Karmilla-v-011/karmilla-bold-011-webfont.eot b/webfontkit/Karmilla-v-011/karmilla-bold-011-webfont.eot Binary files differindex 1d9ef1d..1d9ef1d 100644..100755 --- a/webfontkit/Karmilla-v-011/karmilla-bold-011-webfont.eot +++ b/webfontkit/Karmilla-v-011/karmilla-bold-011-webfont.eot diff --git a/webfontkit/Karmilla-v-011/karmilla-bold-011-webfont.svg b/webfontkit/Karmilla-v-011/karmilla-bold-011-webfont.svg index 89d7d07..89d7d07 100644..100755 --- a/webfontkit/Karmilla-v-011/karmilla-bold-011-webfont.svg +++ b/webfontkit/Karmilla-v-011/karmilla-bold-011-webfont.svg diff --git a/webfontkit/Karmilla-v-011/karmilla-bold-011-webfont.ttf b/webfontkit/Karmilla-v-011/karmilla-bold-011-webfont.ttf Binary files differindex 2fe3dca..2fe3dca 100644..100755 --- a/webfontkit/Karmilla-v-011/karmilla-bold-011-webfont.ttf +++ b/webfontkit/Karmilla-v-011/karmilla-bold-011-webfont.ttf diff --git a/webfontkit/Karmilla-v-011/karmilla-bold-011-webfont.woff b/webfontkit/Karmilla-v-011/karmilla-bold-011-webfont.woff Binary files differindex 7970c54..7970c54 100644..100755 --- a/webfontkit/Karmilla-v-011/karmilla-bold-011-webfont.woff +++ b/webfontkit/Karmilla-v-011/karmilla-bold-011-webfont.woff diff --git a/webfontkit/Karmilla-v-011/karmilla-regular-011-demo.html b/webfontkit/Karmilla-v-011/karmilla-regular-011-demo.html index f2adf55..f2adf55 100644..100755 --- a/webfontkit/Karmilla-v-011/karmilla-regular-011-demo.html +++ b/webfontkit/Karmilla-v-011/karmilla-regular-011-demo.html diff --git a/webfontkit/Karmilla-v-011/karmilla-regular-011-webfont.eot b/webfontkit/Karmilla-v-011/karmilla-regular-011-webfont.eot Binary files differindex aa38b29..aa38b29 100644..100755 --- a/webfontkit/Karmilla-v-011/karmilla-regular-011-webfont.eot +++ b/webfontkit/Karmilla-v-011/karmilla-regular-011-webfont.eot diff --git a/webfontkit/Karmilla-v-011/karmilla-regular-011-webfont.svg b/webfontkit/Karmilla-v-011/karmilla-regular-011-webfont.svg index 8e61004..8e61004 100644..100755 --- a/webfontkit/Karmilla-v-011/karmilla-regular-011-webfont.svg +++ b/webfontkit/Karmilla-v-011/karmilla-regular-011-webfont.svg diff --git a/webfontkit/Karmilla-v-011/karmilla-regular-011-webfont.ttf b/webfontkit/Karmilla-v-011/karmilla-regular-011-webfont.ttf Binary files differindex 5df2e13..5df2e13 100644..100755 --- a/webfontkit/Karmilla-v-011/karmilla-regular-011-webfont.ttf +++ b/webfontkit/Karmilla-v-011/karmilla-regular-011-webfont.ttf diff --git a/webfontkit/Karmilla-v-011/karmilla-regular-011-webfont.woff b/webfontkit/Karmilla-v-011/karmilla-regular-011-webfont.woff Binary files differindex e978378..e978378 100644..100755 --- a/webfontkit/Karmilla-v-011/karmilla-regular-011-webfont.woff +++ b/webfontkit/Karmilla-v-011/karmilla-regular-011-webfont.woff diff --git a/webfontkit/Karmilla-v-011/specimen_files/easytabs.js b/webfontkit/Karmilla-v-011/specimen_files/easytabs.js index 167f53b..167f53b 100644..100755 --- a/webfontkit/Karmilla-v-011/specimen_files/easytabs.js +++ b/webfontkit/Karmilla-v-011/specimen_files/easytabs.js diff --git a/webfontkit/Karmilla-v-011/specimen_files/grid_12-825-55-15.css b/webfontkit/Karmilla-v-011/specimen_files/grid_12-825-55-15.css index 3d6aef7..3d6aef7 100644..100755 --- a/webfontkit/Karmilla-v-011/specimen_files/grid_12-825-55-15.css +++ b/webfontkit/Karmilla-v-011/specimen_files/grid_12-825-55-15.css diff --git a/webfontkit/Karmilla-v-011/specimen_files/karmilla-bold-011-cleartype.png b/webfontkit/Karmilla-v-011/specimen_files/karmilla-bold-011-cleartype.png Binary files differindex c7a9005..c7a9005 100644..100755 --- a/webfontkit/Karmilla-v-011/specimen_files/karmilla-bold-011-cleartype.png +++ b/webfontkit/Karmilla-v-011/specimen_files/karmilla-bold-011-cleartype.png diff --git a/webfontkit/Karmilla-v-011/specimen_files/karmilla-regular-011-cleartype.png b/webfontkit/Karmilla-v-011/specimen_files/karmilla-regular-011-cleartype.png Binary files differindex 93ab729..93ab729 100644..100755 --- a/webfontkit/Karmilla-v-011/specimen_files/karmilla-regular-011-cleartype.png +++ b/webfontkit/Karmilla-v-011/specimen_files/karmilla-regular-011-cleartype.png diff --git a/webfontkit/Karmilla-v-011/specimen_files/specimen_stylesheet.css b/webfontkit/Karmilla-v-011/specimen_files/specimen_stylesheet.css index aecc43c..aecc43c 100644..100755 --- a/webfontkit/Karmilla-v-011/specimen_files/specimen_stylesheet.css +++ b/webfontkit/Karmilla-v-011/specimen_files/specimen_stylesheet.css diff --git a/webfontkit/Karmilla-v-011/stylesheet.css b/webfontkit/Karmilla-v-011/stylesheet.css index 07f046d..07f046d 100644..100755 --- a/webfontkit/Karmilla-v-011/stylesheet.css +++ b/webfontkit/Karmilla-v-011/stylesheet.css |