]> 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: 5a98a11 21d32b4)
Merge branch 'Mario/bd_tweak' into 'master'
authorMario <zacjardine@y7mail.com>
Sat, 18 Feb 2017 08:06:55 +0000 (08:06 +0000)
committerMario <zacjardine@y7mail.com>
Sat, 18 Feb 2017 08:06:55 +0000 (08:06 +0000)
Merge branch Mario/bd_tweak (M merge request)

See merge request !406


Trivial merge