]> 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: 5cbd568 4718397)
Merge branch 'master' into samual/water_and_damage_blur
authorSamual <samual@xonotic.org>
Tue, 18 Jan 2011 19:58:03 +0000 (14:58 -0500)
committerSamual <samual@xonotic.org>
Tue, 18 Jan 2011 19:58:03 +0000 (14:58 -0500)
1  2 
defaultXonotic.cfg patch | diff1 | diff2 | blob | history
qcsrc/client/View.qc patch | diff1 | diff2 | blob | history

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