]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into morphed/splashfx
authorMario <mario@smbclan.net>
Tue, 14 Jun 2016 18:02:58 +0000 (04:02 +1000)
committerMario <mario@smbclan.net>
Tue, 14 Jun 2016 18:02:58 +0000 (04:02 +1000)
commit14e2b9f50f81bc217163653e99ebb52fd6f78c43
tree7c0ddc7af51ba0ad1bdd45b56c63f68b314f0bc2
parent8d9542456903cba1f34ba193e425d4e1263ed51e
parent49260b6ae3d0ffae7f73abe2da1d8a35859b162d
Merge branch 'master' into morphed/splashfx

# Conflicts:
# effectinfo.txt
effectinfo.txt
qcsrc/common/effects/effectinfo.inc
wtf.diff