]> 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: 6072227 d35f200)
Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
authorLyberta <lyberta@lyberta.net>
Mon, 13 Mar 2017 11:49:01 +0000 (14:49 +0300)
committerLyberta <lyberta@lyberta.net>
Mon, 13 Mar 2017 11:49:01 +0000 (14:49 +0300)
1  2 
bal-wep-overkill.cfg patch | diff1 | diff2 | blob | history
qcsrc/client/view.qc patch | diff1 | diff2 | blob | history

diff --cc bal-wep-overkill.cfg
Simple merge
diff --cc qcsrc/client/view.qc
Simple merge