]> 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: 0250eeb 7620bad)
Merge remote branch 'origin/master' into fruitiex/cl_vyes
authorFruitieX <fruitiex@gmail.com>
Tue, 30 Nov 2010 11:19:13 +0000 (13:19 +0200)
committerFruitieX <fruitiex@gmail.com>
Tue, 30 Nov 2010 11:19:13 +0000 (13:19 +0200)
1  2 
defaultXonotic.cfg patch | diff1 | diff2 | blob | history
qcsrc/client/Main.qc patch | diff1 | diff2 | blob | history
qcsrc/client/hud.qc patch | diff1 | diff2 | blob | history

diff --cc defaultXonotic.cfg
Simple merge
diff --cc qcsrc/client/Main.qc
Simple merge
diff --cc qcsrc/client/hud.qc
Simple merge