]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/infomessages_panel_update
authorterencehill <piuntn@gmail.com>
Mon, 25 Jul 2016 17:47:00 +0000 (19:47 +0200)
committerterencehill <piuntn@gmail.com>
Mon, 25 Jul 2016 21:49:30 +0000 (23:49 +0200)
commitc13fdf2b49eff1d26abc73d42e33636162a9b527
tree94c6459940ec540b8e5788581b2ea11fc7021f02
parentfc15d72b041c9a748b605ba28735380fbe5b5b01
parent9068daf471b52559acd6aa58eeaa928899b9f0fa
Merge branch 'master' into terencehill/infomessages_panel_update

Conflicts:
qcsrc/client/hud/panel/infomessages.qc
_hud_common.cfg
qcsrc/client/hud/panel/infomessages.qc