]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into terencehill/itemstime
authorterencehill <piuntn@gmail.com>
Wed, 21 Dec 2011 20:21:05 +0000 (21:21 +0100)
committerterencehill <piuntn@gmail.com>
Wed, 21 Dec 2011 20:21:05 +0000 (21:21 +0100)
1  2 
defaultXonotic.cfg
qcsrc/server/cl_client.qc
qcsrc/server/t_items.qc

Simple merge
Simple merge
Simple merge