From: terencehill <piuntn@gmail.com>
Date: Tue, 6 Aug 2013 22:19:40 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/screenshot_viewer
X-Git-Tag: xonotic-v0.8.0~139^2~1^2~155^2~6
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=0d3f9b43325161631e21e0daa8dfdd943975fe74

Merge branch 'master' into terencehill/screenshot_viewer
---

0d3f9b43325161631e21e0daa8dfdd943975fe74
diff --cc gfx/menu/wickedx/skinvalues.txt
index 2757c1fc2,156051285..be0ee5b0e
mode 100644,100755..100644
--- a/gfx/menu/wickedx/skinvalues.txt
+++ b/gfx/menu/wickedx/skinvalues.txt