]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into martin-t/okc2
authorMartin Taibr <taibr.martin@gmail.com>
Tue, 29 Aug 2017 00:37:01 +0000 (02:37 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Tue, 29 Aug 2017 00:37:01 +0000 (02:37 +0200)
commit133d11b551774ae3a10508774d4628e2671c692a
treeb21bab6a96232575c6c053f81f03ea989e7f04b3
parentb2d3d16a9a3e5df1c518ecd2fce0bfa741db190a
parent2c2a008a2c1b25d47a81f5d7836a510d4643273a
Merge branch 'master' into martin-t/okc2