]> 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: c44fd68 5a0f563)
Merge branch 'master' into fruitiex/panelhud
authorFruitieX <fruitiex@gmail.com>
Sat, 16 Apr 2011 11:25:33 +0000 (14:25 +0300)
committerFruitieX <fruitiex@gmail.com>
Sat, 16 Apr 2011 11:25:33 +0000 (14:25 +0300)
1  2 
qcsrc/client/View.qc patch | diff1 | diff2 | blob | history

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