Merge branch 'master' into divVerent/crypto2
authorRudolf Polzer <divverent@alientrap.org>
Sat, 2 Oct 2010 08:46:05 +0000 (10:46 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 2 Oct 2010 08:46:05 +0000 (10:46 +0200)
commit6af4e73de035e6bbed9ba2d60e0768c43dc66f2a
treea2a262ae1eba2cd1134d601526d3301f724239e7
parent992844fd6e60c81367e690c7bfef86159aefb3b8
parent900eb72e1a12824870d1367ea1bef7778751dc5e
Merge branch 'master' into divVerent/crypto2
defaultXonotic.cfg
qcsrc/server/cl_client.qc