]> 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, 12 Feb 2013 14:58:49 +0000 (09:58 -0500)
committerSamual Lenks <samual@xonotic.org>
Tue, 12 Feb 2013 14:58:49 +0000 (09:58 -0500)
commite7c63b4a159ba5bed1a4e35d1df9ca19cdef95a2
tree379783b3a335530a7494190fd1eca4e29231d88f
parent31c40b8fe41453b216810dd2f601bae85532350a
parent166e9c67e14a8ab65e883a3824167fbfd62b37c0
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite
defaultXonotic.cfg
qcsrc/client/autocvars.qh
qcsrc/client/csqcmodel_hooks.qc
qcsrc/common/util.qc
qcsrc/common/util.qh
qcsrc/server/autocvars.qh
qcsrc/server/miscfunctions.qc