]> 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: eb5b23e cff5b8d)
Merge branch 'div0/mutatorsystem' of git://git.xonotic.org/xonotic/xonotic-data.pk3di...
authorFlorian Paul Schmidt <mista.tapas@gmx.net>
Sat, 20 Mar 2010 00:50:06 +0000 (01:50 +0100)
committerFlorian Paul Schmidt <mista.tapas@gmx.net>
Sat, 20 Mar 2010 00:50:06 +0000 (01:50 +0100)
1  2 
qcsrc/server/cl_client.qc patch | diff1 | diff2 | blob | history

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