]> 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: 73aef95 3eb0761)
Merge remote-tracking branch 'origin/atheros/item_keys'
authorRudolf Polzer <divverent@xonotic.org>
Mon, 24 Oct 2011 09:54:50 +0000 (11:54 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 24 Oct 2011 09:54:50 +0000 (11:54 +0200)
1  2 
qcsrc/server/cl_client.qc patch | diff1 | diff2 | blob | history
qcsrc/server/defs.qh patch | diff1 | diff2 | blob | history

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