]> git.xonotic.org Git - xonotic/xonotic.git/commit
Merge branch 'master' into divVerent/crypto2
authorRudolf Polzer <divverent@alientrap.org>
Mon, 26 Jul 2010 12:34:39 +0000 (14:34 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 26 Jul 2010 12:34:39 +0000 (14:34 +0200)
commit8640529781a776fc2784c1b66de270d2d2375e8e
tree1c9ea2b0cda4a36ad53340def36017924b30b336
parent39e60744adc8ca86a8d84fa665448a24c7a25ce0
parentae6e74a75c5770c30a726378320f7f34c0407c93
Merge branch 'master' into divVerent/crypto2

Conflicts:
all
all