]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f811e82 19e5fa4)
Merge branch 'master' into Mario/monsters
authorMario <mario@smbclan.net>
Sat, 5 Aug 2017 10:05:12 +0000 (20:05 +1000)
committerMario <mario@smbclan.net>
Sat, 5 Aug 2017 10:05:12 +0000 (20:05 +1000)
1  2 
qcsrc/common/monsters/monster/mage.qc patch | diff1 | diff2 | blob | history
qcsrc/common/notifications/all.inc patch | diff1 | diff2 | blob | history

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