]> git.rm.cloudns.org Git - xonotic/xonotic.git/commit
Merge branch 'master' into Mario/win64
authorterencehill <piuntn@gmail.com>
Wed, 14 Jun 2017 20:36:12 +0000 (22:36 +0200)
committerterencehill <piuntn@gmail.com>
Wed, 14 Jun 2017 20:36:12 +0000 (22:36 +0200)
commit8847a910725c23d50aac932f4830cef7a4b3ae1f
treec5911871be26035f8b764346042712fc6e6925bb
parentc0cc5bb8303dd1f21a2a880d2191e3419168422a
parentdb64c0e16ea89bca0d55af5a26f17ecef0fe6316
Merge branch 'master' into Mario/win64