Merge remote branch 'origin/master' into mirceakitsune/preview_images
authorSamual <samual@xonotic.org>
Mon, 2 Jan 2012 05:52:58 +0000 (00:52 -0500)
committerSamual <samual@xonotic.org>
Mon, 2 Jan 2012 05:52:58 +0000 (00:52 -0500)
commit684f569c626ee8a81b3269df66d5e36f123f450e
tree7faa76dd7d41544378bdd1963d419702a1edc293
parent9d277191ddf2f6d96bddb1c2ee862a41395da643
parent797664da00e9b4fe3d87338802fb661100d54bfc
Merge remote branch 'origin/master' into mirceakitsune/preview_images

Conflicts:
qcsrc/client/mapvoting.qc
qcsrc/client/Main.qc
qcsrc/client/mapvoting.qc
qcsrc/common/util.qc
qcsrc/common/util.qh
qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c
qcsrc/menu/xonotic/maplist.c