Merge commit '683672ff5de2463c9c29cd27bc96b658e61bac98'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 14 May 2011 12:37:33 +0000 (14:37 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 14 May 2011 12:37:33 +0000 (14:37 +0200)
commit032028bc6b28d76c43210256a5dadd0d3f71b4a1
treef87a01e772a687715dd6d112ffb07f96cbff3999
parent776d57d3d746545313180c02b0c5e0e79af757bb
parent683672ff5de2463c9c29cd27bc96b658e61bac98
Merge commit '683672ff5de2463c9c29cd27bc96b658e61bac98'
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/client/main.qh
qcsrc/common/constants.qh
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/defs.qh
qcsrc/server/miscfunctions.qc