]> 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>
Sun, 6 Jan 2013 19:26:48 +0000 (14:26 -0500)
committerSamual Lenks <samual@xonotic.org>
Sun, 6 Jan 2013 19:26:48 +0000 (14:26 -0500)
commit7072a9dc696dc5bd2a5a2c4c706c4a2f5c0a24c5
treeb89e98dcd3979aae092082bda0ff421d37b025b7
parentb7c20f9b639cac100cc3de90860d3a1f4f364e1c
parent8d87869f627ac691ce4bd20bad9d4e57b487ac20
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/hud.qc
qcsrc/common/command/generic.qc
qcsrc/server/bot/bot.qc
qcsrc/server/cl_client.qc
qcsrc/server/domination.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/race.qc