]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into divVerent/crypto2
authorRudolf Polzer <divverent@alientrap.org>
Sun, 12 Sep 2010 17:34:21 +0000 (19:34 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 12 Sep 2010 17:34:21 +0000 (19:34 +0200)
commit9ddc4a6d3d9e74c899fb9f850dc337343cbd5aab
tree7e570037eee597b66ab01d6ed4b46c0971a0030d
parent1929c1ba72390de9b30b94eb2b5eb01567977b88
parent1eb3b4661316043fab97ad518f60c085184d24ea
Merge branch 'master' into divVerent/crypto2

Conflicts:
defaultXonotic.cfg
quake.rc
defaultXonotic.cfg
qcsrc/server/cl_client.qc
quake.rc