]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commitbf74853fcb45247fc856cfc5c2c1b36c314d7e94
tree5116e34c34a520827aae3fd153de2a09fa0fe776
parent4f7b440a76d348e4e31ac5211a833847e60bf049
parent4e2d18f603fb9b0f88d282f4b879a3b2146b82af
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite
qcsrc/client/Main.qc
qcsrc/common/constants.qh