]> 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: 298425a b1e67b8)
Merge branch 'Mario/wepent_experimental' into Mario/wepent_experimental_2
authorMario <mario@smbclan.net>
Sat, 1 Oct 2016 11:12:10 +0000 (21:12 +1000)
committerMario <mario@smbclan.net>
Sat, 1 Oct 2016 11:12:10 +0000 (21:12 +1000)
# Conflicts:
# qcsrc/server/impulse.qc


Trivial merge