]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into Mario/quickmenu_merge
authorSamual Lenks <samual@xonotic.org>
Fri, 27 Dec 2013 08:20:57 +0000 (03:20 -0500)
committerSamual Lenks <samual@xonotic.org>
Fri, 27 Dec 2013 08:20:57 +0000 (03:20 -0500)
commit835d97fedc132c34cd035c763c4750ed49aa44a0
tree41ca3fc4f65877d11687940e25a8e83c5165563d
parent872bbe1136459ec11cee7d757384d4f80b439731
parentcf8895a5790c2ae048c71e0f53bae6409a5500c1
Merge remote-tracking branch 'origin/master' into Mario/quickmenu_merge
defaultXonotic.cfg
qcsrc/client/hud.qc
qcsrc/common/util.qh