]> icculus.org git repositories - divverent/nexuiz.git/commit
Merge branch 'master' into div0/warpzones div0/warpzones
authorRudolf Polzer <rpolzer@grawp.div0.qc.to>
Sun, 28 Feb 2010 19:36:06 +0000 (20:36 +0100)
committerRudolf Polzer <rpolzer@grawp.div0.qc.to>
Sun, 28 Feb 2010 19:36:06 +0000 (20:36 +0100)
commit08ee76dcdfa92e84ed5f69d9328164296b291620
tree68b959c5a89db568c0fabe0c74dbe2ff6aa877b1
parent54e3759e7b23338aa2358f70f4db04517c2071a9
parentb5703a24292bc7bbae4462e78a6f7813e5fab2b4
Merge branch 'master' into div0/warpzones

Conflicts:
data/qcsrc/client/View.qc
data/qcsrc/client/View.qc