]> 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: 75e5c4b aeaeadf)
Merge branch 'master' into mirceakitsune/event_chasecam
authormand1nga <mand1nga@xonotic.org>
Sat, 30 Apr 2011 13:15:51 +0000 (10:15 -0300)
committermand1nga <mand1nga@xonotic.org>
Sat, 30 Apr 2011 13:15:51 +0000 (10:15 -0300)
1  2 
qcsrc/client/Main.qc patch | diff1 | diff2 | blob | history

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