]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into 'jwinnie/bold-frag-message' jwinnie/bold-frag-message
authorJeremy Potter <gitlab@stormdesign.us>
Sun, 19 Apr 2020 00:22:37 +0000 (00:22 +0000)
committerJeremy Potter <gitlab@stormdesign.us>
Sun, 19 Apr 2020 00:22:37 +0000 (00:22 +0000)
commit0bff432ddd5dc3f8d33cb7266b33de6f54c54162
treeebc32b4b8c911f60e5b74573d3eadb2649ebca17
parentb6bce921d31c62e38af7334d88b4fd2fa6a761a5
parentc5127cc40542182854bcade2e943088978574475
Merge branch 'master' into 'jwinnie/bold-frag-message'

# Conflicts:
#   qcsrc/client/autocvars.qh
qcsrc/client/autocvars.qh