]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into drjaska/effectinfo
authordrjaska <drjaska83@gmail.com>
Fri, 12 Nov 2021 13:03:06 +0000 (15:03 +0200)
committerdrjaska <drjaska83@gmail.com>
Fri, 12 Nov 2021 13:03:06 +0000 (15:03 +0200)
commit571f7d83294ce0894386c77d4e73d97389e83416
tree2783a70f10252ed4d0c8579a87085140e42237d1
parent56c5e62db234fb8c3c44a8c8b314ca2b181a8b0f
parent47ec8202d51bcd12b727f12b9dca09b1927e6187
Merge branch 'master' into drjaska/effectinfo