]> 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: 5e0e1e6 b389aba)
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite
authorSamual Lenks <samual@xonotic.org>
Wed, 24 Oct 2012 21:40:34 +0000 (17:40 -0400)
committerSamual Lenks <samual@xonotic.org>
Wed, 24 Oct 2012 21:40:34 +0000 (17:40 -0400)
1  2 
commands.cfg patch | diff1 | diff2 | blob | history
defaultXonotic.cfg patch | diff1 | diff2 | blob | history
qcsrc/server/w_tuba.qc patch | diff1 | diff2 | blob | history

diff --cc commands.cfg
Simple merge
diff --cc defaultXonotic.cfg
Simple merge
diff --cc qcsrc/server/w_tuba.qc
Simple merge