]> 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>
Fri, 8 Feb 2013 02:21:08 +0000 (21:21 -0500)
committerSamual Lenks <samual@xonotic.org>
Fri, 8 Feb 2013 02:21:08 +0000 (21:21 -0500)
commitcfc97de2f89e06a0dd538202d4073c4aed16173e
treec3389821f280567b328ef68418574d66410b196f
parent48b16038f42ed753a936be9fa3779863c84d3a33
parent2b39ce52fed96bf1d0eec2209c34632308590e1c
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/server/g_world.qc