]> 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, 5 Feb 2013 17:04:19 +0000 (12:04 -0500)
committerSamual Lenks <samual@xonotic.org>
Tue, 5 Feb 2013 17:04:19 +0000 (12:04 -0500)
commitf4803dbafcdd9f29092535640728e3de19a987da
tree1003a14bea7f533524a2e4dafcea028ea4b3ea3e
parent098f27a2add4aca8b86ad01e7859c70e150e1ab5
parent47d0cce0ac225e41d45701a0e8f38b39df9b53ef
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite
defaultXonotic.cfg
qcsrc/client/View.qc
qcsrc/client/autocvars.qh