]> 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: 0909c31 29639b2)
Merge branch 'Mario/impulse_broken'
authorMario <mario@smbclan.net>
Sat, 12 Mar 2016 06:01:01 +0000 (16:01 +1000)
committerMario <mario@smbclan.net>
Sat, 12 Mar 2016 06:01:01 +0000 (16:01 +1000)

Trivial merge