]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f7b39d7 3cccadd)
Merge branch 'master' of ssh://gitlab.com/xonotic/xonotic-data.pk3dir into kickban...
authorMattia Basaglia <mattia.basaglia@gmail.com>
Fri, 30 Jan 2015 09:47:27 +0000 (10:47 +0100)
committerMattia Basaglia <mattia.basaglia@gmail.com>
Fri, 30 Jan 2015 09:47:27 +0000 (10:47 +0100)

Trivial merge