Merge branch 'master' of gitlab.com:xonotic/xonotic into sev/unifont_update
authorSeverin Meyer <sev.ch@web.de>
Thu, 11 Jun 2015 17:27:33 +0000 (19:27 +0200)
committerSeverin Meyer <sev.ch@web.de>
Thu, 11 Jun 2015 17:27:33 +0000 (19:27 +0200)
commit2627fa199fee9062e810d1bde97d5a9ce0ffe5c8
tree63a968bea27ef78e2ebe878481f5380e5bdf1045
parentae42651d6185955b0352c883adae13cbe39720bd
parentb2f2ba427705f90379bf1b3768721792bd7eab55
Merge branch 'master' of gitlab.com:xonotic/xonotic into sev/unifont_update

Conflicts:
data/font-nimbussansl.pk3dir/font-nimbussansl.cfg
data/font-xolonium.pk3dir/font-xolonium.cfg
data/font-nimbussansl.pk3dir/font-nimbussansl.cfg
data/font-xolonium.pk3dir/font-xolonium.cfg
misc/tools/all/release.subr