]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commita71acaee20a61f78365ad6a05572f3b5e6812fb4
tree88d6e19fc19bde6dcad84f7f7cdd44ef214e2984
parent298425a748759a8398b763f7d150f7dc98d5d780
parentb1e67b8362394879c1d0c6250930820cc56b5b36
Merge branch 'Mario/wepent_experimental' into Mario/wepent_experimental_2

# Conflicts:
# qcsrc/server/impulse.qc