]> icculus.org git repositories - divverent/nexuiz.git/commit
Merge branch 'master' into fruitiex/panelhud
authorRasmus <rasse@rasse-desktop.(none)>
Wed, 24 Feb 2010 10:04:57 +0000 (12:04 +0200)
committerRasmus <rasse@rasse-desktop.(none)>
Wed, 24 Feb 2010 10:04:57 +0000 (12:04 +0200)
commitcb970245790bc605b66d4b2458af14b4df7d837e
tree066d1ee41ac662fb8030f6f3a0e9d7b21c7cbc07
parentb9de3fe0ee42f062c9fffc9225fe3b54e9d31280
parent2dd5a3a94fcdd864cb5c81fd7a3d73b0448fdc6c
Merge branch 'master' into fruitiex/panelhud
data/defaultNexuiz.cfg
data/qcsrc/client/mapvoting.qc
data/qcsrc/menu/menu.qh