diff options
author | simon <none@none> | 2013-05-09 14:10:45 -0700 |
---|---|---|
committer | simon <none@none> | 2013-05-09 14:10:45 -0700 |
commit | ee2fce8790b69d61845cc32fbf7cdce8a33b0dab (patch) | |
tree | 5060f42dca293102c868038f127c1a74f5c4a6aa /indra/newview/fonts | |
parent | cd8e0b92e1c8f9f8544b1011e61c21c7789b93b7 (diff) | |
parent | 8895e795763d14c3dae495b3648da3d4a52ba30a (diff) |
Merge downstream code and viewer-beta
Diffstat (limited to 'indra/newview/fonts')
-rwxr-xr-x[-rw-r--r--] | indra/newview/fonts/DejaVu-license.txt | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | indra/newview/fonts/DejaVuSans-Bold.ttf | bin | 573136 -> 573136 bytes | |||
-rwxr-xr-x[-rw-r--r--] | indra/newview/fonts/DejaVuSans-BoldOblique.ttf | bin | 524056 -> 524056 bytes | |||
-rwxr-xr-x[-rw-r--r--] | indra/newview/fonts/DejaVuSans-Oblique.ttf | bin | 523804 -> 523804 bytes | |||
-rwxr-xr-x[-rw-r--r--] | indra/newview/fonts/DejaVuSans.ttf | bin | 622280 -> 622280 bytes | |||
-rwxr-xr-x[-rw-r--r--] | indra/newview/fonts/DejaVuSansMono.ttf | bin | 321524 -> 321524 bytes |
6 files changed, 0 insertions, 0 deletions
diff --git a/indra/newview/fonts/DejaVu-license.txt b/indra/newview/fonts/DejaVu-license.txt index 254e2cc42a..254e2cc42a 100644..100755 --- a/indra/newview/fonts/DejaVu-license.txt +++ b/indra/newview/fonts/DejaVu-license.txt diff --git a/indra/newview/fonts/DejaVuSans-Bold.ttf b/indra/newview/fonts/DejaVuSans-Bold.ttf Binary files differindex ec1a2ebaf2..ec1a2ebaf2 100644..100755 --- a/indra/newview/fonts/DejaVuSans-Bold.ttf +++ b/indra/newview/fonts/DejaVuSans-Bold.ttf diff --git a/indra/newview/fonts/DejaVuSans-BoldOblique.ttf b/indra/newview/fonts/DejaVuSans-BoldOblique.ttf Binary files differindex 1a5576460d..1a5576460d 100644..100755 --- a/indra/newview/fonts/DejaVuSans-BoldOblique.ttf +++ b/indra/newview/fonts/DejaVuSans-BoldOblique.ttf diff --git a/indra/newview/fonts/DejaVuSans-Oblique.ttf b/indra/newview/fonts/DejaVuSans-Oblique.ttf Binary files differindex becc549927..becc549927 100644..100755 --- a/indra/newview/fonts/DejaVuSans-Oblique.ttf +++ b/indra/newview/fonts/DejaVuSans-Oblique.ttf diff --git a/indra/newview/fonts/DejaVuSans.ttf b/indra/newview/fonts/DejaVuSans.ttf Binary files differindex c1b19d8705..c1b19d8705 100644..100755 --- a/indra/newview/fonts/DejaVuSans.ttf +++ b/indra/newview/fonts/DejaVuSans.ttf diff --git a/indra/newview/fonts/DejaVuSansMono.ttf b/indra/newview/fonts/DejaVuSansMono.ttf Binary files differindex 6bc854ddae..6bc854ddae 100644..100755 --- a/indra/newview/fonts/DejaVuSansMono.ttf +++ b/indra/newview/fonts/DejaVuSansMono.ttf |