]> git.xonotic.org Git - xonotic/xonotic.git/commit
Merge branch 'master' into Mario/win64
authorterencehill <piuntn@gmail.com>
Mon, 28 Aug 2017 13:11:00 +0000 (15:11 +0200)
committerterencehill <piuntn@gmail.com>
Mon, 28 Aug 2017 13:11:00 +0000 (15:11 +0200)
commit01c0c7c4694ebd2ec969185f4a935cd478497982
treeb5478563a07e64ab07f3ca0017cdbda1df88be1d
parent8847a910725c23d50aac932f4830cef7a4b3ae1f
parent014a5cf15637aa5596156a761461651d9d40e73f
Merge branch 'master' into Mario/win64