Merge branch 'master' into terencehill/itemstime
authorterencehill <piuntn@gmail.com>
Tue, 2 Oct 2012 17:08:40 +0000 (19:08 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 2 Oct 2012 17:08:40 +0000 (19:08 +0200)
commit138e8a13857ec32c09da2335049b82d576736b47
tree1f90e32a3f3a1266a613faab18f22f4c0be053fc
parent2e8d8e34f5654af82145fc687faaf9c1ce54fe34
parent4e2d18f603fb9b0f88d282f4b879a3b2146b82af
Merge branch 'master' into terencehill/itemstime
defaultXonotic.cfg
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/client/waypointsprites.qc
qcsrc/common/constants.qh
qcsrc/common/util.qh
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh
qcsrc/server/g_world.qc
qcsrc/server/t_items.qc