]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Thu, 23 Mar 2017 04:22:56 +0000 (07:22 +0300)
committerLyberta <lyberta@lyberta.net>
Thu, 23 Mar 2017 04:22:56 +0000 (07:22 +0300)
commit31d530f9b6a2816e395ccf9a654ce689c2629c74
tree4794d39d8c1ddb9583b09ed498fac1bb1371399a
parentc2bee8d0379eaa73b0d6a4ccca40bbbba729df2e
parentfd2140d036953937c7b99a2dcae0cb5a34d04e62
Merge branch 'master' into Lyberta/master
defaultXonotic.cfg