]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 580c768 220b53b)
Merge remote branch 'origin/master' into fruitiex/fruitbalance
authorFruitieX <rasse@rasse-laptop.(none)>
Wed, 13 Oct 2010 07:34:36 +0000 (10:34 +0300)
committerFruitieX <rasse@rasse-laptop.(none)>
Wed, 13 Oct 2010 07:34:36 +0000 (10:34 +0300)
1  2 
qcsrc/client/View.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/View.qc
Simple merge