Merge remote-tracking branch 'ummeegge/lynis' into next

Conflicts:
	make.sh
This commit is contained in:
Michael Tremer
2015-01-28 22:49:36 +01:00
110 changed files with 59963 additions and 2561 deletions

View File

@@ -17,7 +17,7 @@
. ${rc_functions}
eval $(/usr/local/bin/readhash /var/ipfire/main/settings)
FONT="LatArCyrHeb-16"
FONT="latarcyrheb-sun16"
KEYMAP_CORRECTIONS="euro2"
UNICODE="1"
BROKEN_COMPOSE="0"