]> 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: f30bd04 a3b5728)
Merge branch 'master' into Mario/monsters
authorMario <mario@smbclan.net>
Fri, 29 Dec 2017 10:16:19 +0000 (20:16 +1000)
committerMario <mario@smbclan.net>
Fri, 29 Dec 2017 10:16:19 +0000 (20:16 +1000)
1  2 
qcsrc/common/monsters/sv_monsters.qc patch | diff1 | diff2 | blob | history
qcsrc/common/notifications/all.inc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/common/monsters/sv_monsters.qc
Simple merge
diff --cc qcsrc/common/notifications/all.inc
Simple merge