]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'martin-t/okc2' into martin-t/master
authorMartin Taibr <taibr.martin@gmail.com>
Sat, 19 Aug 2017 20:24:38 +0000 (22:24 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sat, 19 Aug 2017 20:24:38 +0000 (22:24 +0200)
commitf43cfc6cbea063731ca1b7d016ab7544e5c2e28f
tree64666f6e318b1a84dd282a3b0b63e0dc307e8005
parent3eca2c8f2fde1a01dd5323b1f7c74758972e376d
parentf2ae373cebfbb0be131d353c0e7e202762b12f7d
Merge branch 'martin-t/okc2' into martin-t/master