Merge branch 'master' into terencehill/itemstime
authorterencehill <piuntn@gmail.com>
Sat, 31 Dec 2011 18:21:41 +0000 (19:21 +0100)
committerterencehill <piuntn@gmail.com>
Sat, 31 Dec 2011 18:21:41 +0000 (19:21 +0100)
commitd1524439b1521ce2fcea1359c2ed7501fa5550dd
tree4f6869aaba147e35e162fb66e288b84d2b84f47f
parentd8edcdf62863a802205a77a338f32cea36061dea
parent8edee1521024b69aacac0fcb74be97e5a0d1da39
Merge branch 'master' into terencehill/itemstime
defaultXonotic.cfg
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