]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw (from: bfdab05)
Merge branch 'master' into sev/xolonium
authorSeverin Meyer <sev.ch@web.de>
Tue, 23 Dec 2014 19:48:00 +0000 (20:48 +0100)
committerSeverin Meyer <sev.ch@web.de>
Tue, 23 Dec 2014 19:48:00 +0000 (20:48 +0100)
Conflicts:
data/font-xolonium.pk3dir/font-xolonium.cfg


No differences found