From: nyov <nyov@nexnode.net>
Date: Thu, 20 Nov 2014 18:15:44 +0000 (+0000)
Subject: Merge branch 'xonotic'
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1cfdea7ea84610460c9234f877a975ced55b6409;p=xonotic%2Fxonotic.wiki.git

Merge branch 'xonotic'

(Not much left that I can really take, sorry)

Changes to be committed:
	modified:   Hardware_Requirements.md
---

1cfdea7ea84610460c9234f877a975ced55b6409