]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/terencehill/directmenu_options'
authorSamual Lenks <samual@xonotic.org>
Wed, 12 Dec 2012 21:59:22 +0000 (16:59 -0500)
committerSamual Lenks <samual@xonotic.org>
Wed, 12 Dec 2012 21:59:22 +0000 (16:59 -0500)
commit7de32704d7b8cfffdd701e143de8672d018e16e2
tree81c5728bfd1dde42c06df239f36fc1e1999a2c4e
parent64b6c7420b3e1c307f408a9f17d9c765a268621a
parent8a000d27bdf428db93e0304c4fdee5a26b89e9e8
Merge remote-tracking branch 'origin/terencehill/directmenu_options'