]> 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>
Tue, 15 Jan 2013 03:11:34 +0000 (22:11 -0500)
committerSamual Lenks <samual@xonotic.org>
Tue, 15 Jan 2013 03:11:34 +0000 (22:11 -0500)
commitfdbb1364d05c525c5dfc178b10baf435fd00840c
treeff1da7ee1dafc015c39cb2ec4f67e4460d516594
parent8db035f374df1c19ea24531f8a96f04625f5f559
parented35c904c94fd7a4bca36bc3507b63c26820b923
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite
qcsrc/client/Main.qc
qcsrc/client/shownames.qc
qcsrc/client/tturrets.qc
qcsrc/client/waypointsprites.qc
qcsrc/server/bot/bot.qc
qcsrc/server/scores.qc