]> 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, 30 Jan 2013 05:20:06 +0000 (00:20 -0500)
committerSamual Lenks <samual@xonotic.org>
Wed, 30 Jan 2013 05:20:06 +0000 (00:20 -0500)
commit19ab1a2ba6824a03f8d263d27cc84dc7d54958ac
treeac4e20fa0e13cd378d4b5817e66778990f3c5152
parent9db1d38250e9382ab4b86b3d52af6878f3db86c4
parent373da6f709e05d4e1bf696da0b03ef2a880a2583
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/autocvars.qh