]> 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: 37cf620 b042359)
Merge branch 'master' into Mario/hagar_notfixed 297/head
authorMario <mario@smbclan.net>
Tue, 5 Apr 2016 22:55:40 +0000 (08:55 +1000)
committerMario <mario@smbclan.net>
Tue, 5 Apr 2016 22:55:40 +0000 (08:55 +1000)
1  2 
qcsrc/client/view.qc patch | diff1 | diff2 | blob | history
qcsrc/common/weapons/weapon/hagar.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/view.qc
Simple merge
diff --cc qcsrc/common/weapons/weapon/hagar.qc
Simple merge