]> 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: 4f7b440 4e2d18f)
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite
authorSamual Lenks <samual@xonotic.org>
Wed, 3 Oct 2012 16:30:58 +0000 (12:30 -0400)
committerSamual Lenks <samual@xonotic.org>
Wed, 3 Oct 2012 16:30:58 +0000 (12:30 -0400)
1  2 
qcsrc/client/Main.qc patch | diff1 | diff2 | blob | history
qcsrc/common/constants.qh patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/Main.qc
Simple merge
diff --cc qcsrc/common/constants.qh
Simple merge