Merge remote branch 'origin/master' into terencehill/screenshot_viewer
authorSamual <samual@xonotic.org>
Sat, 14 May 2011 18:17:58 +0000 (14:17 -0400)
committerSamual <samual@xonotic.org>
Sat, 14 May 2011 18:17:58 +0000 (14:17 -0400)
commita56126defd6f79767147edebccf6f46022e37ecf
tree5e0c32b5cb9238208fe1ebd202a4996546eddd0b
parent6f75b40eeb1ba7aee59806ef1f1cf1d75e4f857e
parent8ad8bf067e165c2953462c45aea4ff2127967ee2
Merge remote branch 'origin/master' into terencehill/screenshot_viewer

Conflicts:
qcsrc/menu/xonotic/mainwindow.c
qcsrc/menu/classes.c
qcsrc/menu/xonotic/mainwindow.c