diff options
author | Manoj Srivastava <srivasta@debian.org> | 2016-01-27 13:11:31 -0800 |
---|---|---|
committer | Manoj Srivastava <srivasta@debian.org> | 2016-01-27 13:11:31 -0800 |
commit | 02819db3483514d49df7ec3f7e372b5aeb831466 (patch) | |
tree | 6a86adac74beac293bc688dafcfa1709a6476901 /lib/mods/theme/pref/font.prf | |
parent | 2a61dffe127e22c1aaf955db6f085ac2eefbebba (diff) | |
parent | 6f6de67c70fd98815088ce49f046f48f88ea35bd (diff) |
Merge branch 'upstream'
Signed-off-by: Manoj Srivastava <srivasta@debian.org>
# Conflicts:
# src/CMakeLists.txt
# src/config.h
# src/lua/llimits.h
Diffstat (limited to 'lib/mods/theme/pref/font.prf')
-rw-r--r-- | lib/mods/theme/pref/font.prf | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/lib/mods/theme/pref/font.prf b/lib/mods/theme/pref/font.prf index 505964bd..38614683 100644 --- a/lib/mods/theme/pref/font.prf +++ b/lib/mods/theme/pref/font.prf @@ -28,33 +28,13 @@ ?:[IOR [EQU $SYS xaw] [EQU $SYS x11] [EQU $SYS gtk]] %:font-x11.prf -?:[EQU $SYS glu] -%:font-glu.prf - ?:[EQU $SYS gcu] %:font-gcu.prf -?:[EQU $SYS ami] -%:font-ami.prf - ?:[EQU $SYS mac] %:font-mac.prf ?:[EQU $SYS win] %:font-win.prf -?:[EQU $SYS dos] -%:font-dos.prf - -?:[EQU $SYS ibm] -%:font-ibm.prf - -?:[EQU $SYS emx] -%:font-emx.prf - -?:[EQU $SYS acn] -%:font-acn.prf - ?:1 - - |