]> 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: 89854d0 9c353fa)
Merge remote branch 'origin/master' into mirceakitsune/event_chasecam
authorSamual <samual@xonotic.org>
Fri, 29 Apr 2011 05:35:24 +0000 (01:35 -0400)
committerSamual <samual@xonotic.org>
Fri, 29 Apr 2011 05:35:24 +0000 (01:35 -0400)
1  2 
defaultXonotic.cfg patch | diff1 | diff2 | blob | history
qcsrc/client/Main.qc patch | diff1 | diff2 | blob | history

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