]> 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: e7f06e3 a5ecea1)
Merge branch 'Mario/item_wepammo_fix' into 'master'
authorMario <zacjardine@y7mail.com>
Fri, 7 Sep 2018 22:48:19 +0000 (22:48 +0000)
committerMario <zacjardine@y7mail.com>
Fri, 7 Sep 2018 22:48:19 +0000 (22:48 +0000)
Merge branch Mario/item_wepammo_fix (S merge request)

Closes #1920

See merge request xonotic/xonotic-data.pk3dir!587

1  2 
qcsrc/common/notifications/all.inc patch | diff1 | diff2 | blob | history

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