Merge branch 'xonotic'
authornyov <nyov@nexnode.net>
Thu, 20 Nov 2014 18:15:44 +0000 (18:15 +0000)
committernyov <nyov@nexnode.net>
Thu, 20 Nov 2014 18:16:37 +0000 (18:16 +0000)
(Not much left that I can really take, sorry)

Changes to be committed:
modified:   Hardware_Requirements.md


Trivial merge