]> icculus.org git repositories - divverent/nexuiz.git/commit
Merge remote branch 'origin/master' into div0/warpzones
authorRudolf Polzer <rpolzer@nb-04.(none)>
Fri, 12 Feb 2010 14:21:43 +0000 (15:21 +0100)
committerRudolf Polzer <rpolzer@nb-04.(none)>
Fri, 12 Feb 2010 14:21:43 +0000 (15:21 +0100)
commit04c8491ed258b50428a81d584fc0da5695e8d09a
tree145e9f6113db67c5e88974545cf2c493fc013eef
parentf2fa8b148c1e94f1e97ea136c15426fb13b96695
parentdee9787fbbc0a1a96e001f59c43d4c9480bdadf6
Merge remote branch 'origin/master' into div0/warpzones