diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-01-30 01:34:16 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-09 20:00:07 +0100 |
| commit | 1b1050da1c7b84cc72b7efbb2229294975be9e10 (patch) | |
| tree | 68d15ccb015d58aeb5797ffd06efca3e55997c24 /data/fonts | |
| parent | 0d4142a891cd228da24ee3aa3bbd7dc622da5b75 (diff) | |
| parent | 955a7613d1fe116fe5e1da07a222b6849b3c885c (diff) | |
| download | mana-1b1050da1c7b84cc72b7efbb2229294975be9e10.tar.gz mana-1b1050da1c7b84cc72b7efbb2229294975be9e10.tar.bz2 mana-1b1050da1c7b84cc72b7efbb2229294975be9e10.tar.xz mana-1b1050da1c7b84cc72b7efbb2229294975be9e10.zip | |
Merged with Aethyra master as of 2009-01-27
Conflicts:
Almost everywhere.
Diffstat (limited to 'data/fonts')
| -rw-r--r-- | data/fonts/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | data/fonts/Makefile.am | 7 | ||||
| -rw-r--r-- | data/fonts/dejavusans-bold.ttf | bin | 0 -> 569880 bytes | |||
| -rw-r--r-- | data/fonts/dejavusans.ttf | bin | 569716 -> 619108 bytes |
4 files changed, 6 insertions, 3 deletions
diff --git a/data/fonts/CMakeLists.txt b/data/fonts/CMakeLists.txt index dc22e031..d5b6ed85 100644 --- a/data/fonts/CMakeLists.txt +++ b/data/fonts/CMakeLists.txt @@ -1,6 +1,6 @@ SET (FILES dejavusans.ttf + dejavusans-bold.ttf ) INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/fonts) - diff --git a/data/fonts/Makefile.am b/data/fonts/Makefile.am index 331f6c8b..5aa02999 100644 --- a/data/fonts/Makefile.am +++ b/data/fonts/Makefile.am @@ -1,5 +1,8 @@ fontsdir = $(pkgdatadir)/data/fonts -fonts_DATA = dejavusans.ttf +fonts_DATA = \ + dejavusans.ttf \ + dejavusans-bold.ttf -EXTRA_DIST = $(fonts_DATA) +EXTRA_DIST = \ + $(fonts_DATA) diff --git a/data/fonts/dejavusans-bold.ttf b/data/fonts/dejavusans-bold.ttf Binary files differnew file mode 100644 index 00000000..ebefb0ca --- /dev/null +++ b/data/fonts/dejavusans-bold.ttf diff --git a/data/fonts/dejavusans.ttf b/data/fonts/dejavusans.ttf Binary files differindex 627cef46..6253857c 100644 --- a/data/fonts/dejavusans.ttf +++ b/data/fonts/dejavusans.ttf |