]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e2008ef 69fb3ad)
Merge remote branch 'origin/master' into samual/verbose_warnings
authorSamual <samual@xonotic.org>
Tue, 3 May 2011 16:54:55 +0000 (12:54 -0400)
committerSamual <samual@xonotic.org>
Tue, 3 May 2011 16:54:55 +0000 (12:54 -0400)
1  2 
qcsrc/client/Main.qc patch | diff1 | diff2 | blob | history

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