Merge branch 'master' into terencehill/screenshot_viewer
authorterencehill <piuntn@gmail.com>
Sat, 2 Jun 2012 14:25:23 +0000 (16:25 +0200)
committerterencehill <piuntn@gmail.com>
Sat, 2 Jun 2012 14:25:23 +0000 (16:25 +0200)
1  2 
qcsrc/menu/skin-customizables.inc
qcsrc/menu/xonotic/mainwindow.c

Simple merge
Simple merge