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)
commit1cfdea7ea84610460c9234f877a975ced55b6409
treee848c8cf887d847e84b95ec4f64dea7bee80c77c
parentda642db09c241bbb7b1f027944e0e642bab3295c
parent9c8ff5c8ce33f93e5a9ab014e59ec4c7d4a6ad97
Merge branch 'xonotic'

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

Changes to be committed:
modified:   Hardware_Requirements.md