]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ca287b2 7c8995e)
Merge remote branch 'origin/master' into samual/hud_updates
authorSamual <samual@xonotic.org>
Sat, 15 Oct 2011 18:03:04 +0000 (14:03 -0400)
committerSamual <samual@xonotic.org>
Sat, 15 Oct 2011 18:03:04 +0000 (14:03 -0400)
1  2 
qcsrc/server/w_shotgun.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/w_shotgun.qc
Simple merge