]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 468b023 deafac1)
Merge branch 'master' into Mario/wepent_experimental
authorMario <mario@smbclan.net>
Thu, 29 Dec 2016 06:02:34 +0000 (16:02 +1000)
committerMario <mario@smbclan.net>
Thu, 29 Dec 2016 06:02:34 +0000 (16:02 +1000)
# Conflicts:
# qcsrc/common/weapons/weapon/shotgun.qc

1  2 
qcsrc/server/miscfunctions.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/miscfunctions.qc
Simple merge