]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'remotes/origin/terencehill/newpanelhud' into terencehil...
authorterencehill <piuntn@gmail.com>
Mon, 11 Apr 2011 17:20:48 +0000 (19:20 +0200)
committerterencehill <piuntn@gmail.com>
Mon, 11 Apr 2011 17:20:48 +0000 (19:20 +0200)
commitcd4733447ff43d2aa6141fb9b66f718f61d46fc5
tree92e00503a5b6414f5d44212471dcbd8aa91a2701
parent3ae2eeec56497035b6dc0267e3263b48ff1dd47f
parent2f2bbae3858c6b383f36ae0cb0ca41502a27900d
Merge remote-tracking branch 'remotes/origin/terencehill/newpanelhud' into terencehill/newpanelhud

Conflicts:
hud_luminos.cfg
hud_luminos_old.cfg
hud_luminos.cfg
hud_luminos_old.cfg
qcsrc/menu/xonotic/dialog_hudpanel_physics.c