]> 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: b30d05e 4cd9290)
Merge branch 'Mario/colorbeams_v2'
authorMario <mario@smbclan.net>
Thu, 12 Nov 2015 10:47:04 +0000 (20:47 +1000)
committerMario <mario@smbclan.net>
Thu, 12 Nov 2015 10:47:04 +0000 (20:47 +1000)

Trivial merge