]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/fruitiex/mapvote_fix'
authormand1nga <mand1nga@xonotic.org>
Sun, 3 Apr 2011 23:18:32 +0000 (20:18 -0300)
committermand1nga <mand1nga@xonotic.org>
Sun, 3 Apr 2011 23:18:32 +0000 (20:18 -0300)
commit4a26c1a9c8ae3074931fe8295567935567d58f8b
tree1c7e30f584a0a3b1cc37ec9dfddd5badd117a033
parent4b60277648f46e8427ac2859faa79b7daf87d3eb
parent2c626f40436d5216f3611ddfdca0d0470b3b4a97
Merge remote branch 'origin/fruitiex/mapvote_fix'