]> 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: 69baf80 23ed395)
Merge remote-tracking branch 'origin/master' into samual/notification_updates
authorSamual Lenks <samual@xonotic.org>
Mon, 26 Aug 2013 03:09:19 +0000 (23:09 -0400)
committerSamual Lenks <samual@xonotic.org>
Mon, 26 Aug 2013 03:09:19 +0000 (23:09 -0400)
1  2 
qcsrc/common/util.qh patch | diff1 | diff2 | blob | history
qcsrc/server/command/common.qc patch | diff1 | diff2 | blob | history
qcsrc/server/g_world.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/common/util.qh
Simple merge
diff --cc qcsrc/server/command/common.qc
Simple merge
diff --cc qcsrc/server/g_world.qc
Simple merge