]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commit5de7b43dff82c520a331692fbfead74a5beb880c
tree937f032e0d9f34762ebf7638b73f00a2e04ac68a
parent8c821be331c35a6f84cc9f898fb87d68bbc31a6d
parentee070be74db7ed39c74095f73f378f626c5ba2e9
Merge branch 'master' into terencehill/itemstime
defaultXonotic.cfg
qcsrc/server/cl_client.qc
qcsrc/server/t_items.qc