]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'samual/fixes_for_latest_merge' of ssh://git.xonotic.org/xonotic-data...
authorSamual <samual@xonotic.org>
Mon, 14 Mar 2011 22:24:03 +0000 (18:24 -0400)
committerSamual <samual@xonotic.org>
Mon, 14 Mar 2011 22:24:03 +0000 (18:24 -0400)
commit18a5efa8a1e637e89f29b8719600d4cb1dd93e32
treed2931938b1c3008c1ae6c2d9e9be4f9c5496dc4b
parent54bd5bd1ddcb48407ed878b05ccc67941c54adac
parentaf38fc61edabd1bd1a84476dc8a1ebd7cd96724e
Merge branch 'samual/fixes_for_latest_merge' of ssh://git.xonotic.org/xonotic-data.pk3dir into samual/fixes_for_latest_merge