]> icculus.org git repositories - divverent/darkplaces.git/commit
Merge branch 'master' into blub/multicon
authorWolfgang (Blub) Bumiller <blub@speed.at>
Fri, 29 Jan 2010 14:01:56 +0000 (15:01 +0100)
committerWolfgang (Blub) Bumiller <blub@speed.at>
Fri, 29 Jan 2010 14:01:56 +0000 (15:01 +0100)
commit7ae381afcc4e24096720684d9dd5bbf98e8ec78a
tree1a7a4f8e2e1082671347cae7f3ec4c1447bc320b
parent054a0827c08962f0f438ff0282a9bae0066dbaf5
parentd1bef64c3e656b17e20dae840d9b16901fba9fbc
Merge branch 'master' into blub/multicon