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)
commitb47667e4835b470b10ac1875c5dddb766ddd16a3
tree4f69f21a0fcfc8d6eeab4623e0d4386986d8cedc
parentf4fd7a1f430364a251742af47329f16b831718d2
parent71a5c6a7cf9442fc504038825a5cb94ff4355150
Merge branch 'master' into terencehill/screenshot_viewer
qcsrc/menu/skin-customizables.inc
qcsrc/menu/xonotic/mainwindow.c