]> 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: 0f6c4be e780574)
Merge branch 'master' into Mario/wepent_experimental
authorMario <mario@smbclan.net>
Fri, 16 Dec 2016 03:43:58 +0000 (13:43 +1000)
committerMario <mario@smbclan.net>
Fri, 16 Dec 2016 03:43:58 +0000 (13:43 +1000)
1  2 
qcsrc/server/mutators/events.qh patch | diff1 | diff2 | blob | history
qcsrc/server/weapons/selection.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/mutators/events.qh
Simple merge
diff --cc qcsrc/server/weapons/selection.qc
Simple merge