]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into mirceakitsune/preview_images
authorSamual <samual@xonotic.org>
Sat, 7 Jan 2012 18:18:00 +0000 (13:18 -0500)
committerSamual <samual@xonotic.org>
Sat, 7 Jan 2012 18:18:00 +0000 (13:18 -0500)
commitb7ee5fd9f465455a5691abba80a7e83a1ab5b2d8
treec00674337464a47b8376981a3e66a725ef1a0844
parent4e74b14c22b31c92b2770720ed3c5944299ae93b
parent13473bb65989876d8bf74cfa9e1a6e4efa65a6fe
Merge remote branch 'origin/master' into mirceakitsune/preview_images

Conflicts:
qcsrc/common/util.qh
qcsrc/client/Main.qc
qcsrc/client/mapvoting.qc
qcsrc/common/util.qc
qcsrc/common/util.qh