]> 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: 0d34339 4418200)
Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
authorLyberta <lyberta@lyberta.net>
Wed, 10 May 2017 12:40:55 +0000 (15:40 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 10 May 2017 12:40:55 +0000 (15:40 +0300)
1  2 
qcsrc/client/view.qc patch | diff1 | diff2 | blob | history
qcsrc/server/client.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/view.qc
Simple merge
diff --cc qcsrc/server/client.qc
Simple merge