]> 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: 75a16a5 3eb37f1)
Merge branch 'master' into mario/monsters
authorMario <mario.mario@y7mail.com>
Mon, 25 Feb 2013 19:24:24 +0000 (06:24 +1100)
committerMario <mario.mario@y7mail.com>
Mon, 25 Feb 2013 19:24:24 +0000 (06:24 +1100)
1  2 
qcsrc/client/hud.qc patch | diff1 | diff2 | blob | history
qcsrc/server/defs.qh patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/hud.qc
Simple merge
diff --cc qcsrc/server/defs.qh
Simple merge