]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote branch 'origin/fruitiex/fruitbalance' into fruitiex/fruitbalance
authorFruitieX <rasse@rasse-laptop.(none)>
Sun, 3 Oct 2010 16:46:58 +0000 (19:46 +0300)
committerFruitieX <rasse@rasse-laptop.(none)>
Sun, 3 Oct 2010 16:46:58 +0000 (19:46 +0300)
1  2 
qcsrc/client/View.qc

Simple merge