]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 86f1ba2 35f5b32)
Merge branch 'Mario/func_breakable_playercheck' into 'master'
authorMirio <opivy@hotmail.de>
Fri, 15 Jun 2018 17:21:42 +0000 (17:21 +0000)
committerMirio <opivy@hotmail.de>
Fri, 15 Jun 2018 17:21:42 +0000 (17:21 +0000)
Merge branch Mario/func_breakable_playercheck (XXS merge request)

See merge request xonotic/xonotic-data.pk3dir!566


Trivial merge