]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into martin-t/defaults
authorMartin Taibr <taibr.martin@gmail.com>
Tue, 25 Jul 2017 23:49:38 +0000 (01:49 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Tue, 25 Jul 2017 23:49:38 +0000 (01:49 +0200)
commit90da6817bc443ee9402472527e746af2c254926e
tree3ce2b720b4ccf7feced646fef1e153717fa4794c
parent91be51af76146036564f55499150039f62f772c5
parentc4e0c3f1fa4102e0661ac0f6df10e28159bea595
Merge branch 'master' into martin-t/defaults