]> 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: faa6bfe e64a18c)
Merge branch 'Mario/wep_settemp_fix'
authorMario <zacjardine@y7mail.com>
Sat, 24 Jan 2015 01:55:46 +0000 (12:55 +1100)
committerMario <zacjardine@y7mail.com>
Sat, 24 Jan 2015 01:55:46 +0000 (12:55 +1100)

Trivial merge