Merge branch 'master' into next

Conflicts:
	doc/language_missings
This commit is contained in:
Arne Fitzenreiter
2011-08-09 05:49:10 +02:00
30 changed files with 3434 additions and 165 deletions

View File

@@ -31,6 +31,10 @@ if [ "$LANGUAGE" == "pl" ]; then
FONT="lat2-16"
fi
if [ "$LANGUAGE" == "ru" ]; then
FONT="LatArCyrHeb-16"
fi
UNICODE="1"
BROKEN_COMPOSE="0"