]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/hud_configure
authorterencehill <piuntn@gmail.com>
Sun, 5 Apr 2015 23:12:21 +0000 (01:12 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 5 Apr 2015 23:12:21 +0000 (01:12 +0200)
commitbedc4037f669e55758528498bc1eb19311f6f71c
tree325209fe0d7e3f7f2dbd55c776d6b99893d285ec
parent5cf50c6a1436ab227a0994450ddb92885ce3595d
parent46dc92dc37eb929081a6d9f40f70e65afb8f8327
Merge branch 'master' into terencehill/hud_configure
qcsrc/client/hud.qc