summaryrefslogtreecommitdiffstats
path: root/.ci/scripts/merge
diff options
context:
space:
mode:
authorcomex <comexk@gmail.com>2020-12-29 20:22:35 +0100
committercomex <comexk@gmail.com>2020-12-29 20:22:35 +0100
commitb36896b90e825bdc89a61c99ece3def6c15c012a (patch)
treed4ba824623723a997c3aff339d16a994fbb19902 /.ci/scripts/merge
parentMerge pull request #5236 from gal20/udp_client_patch (diff)
downloadyuzu-b36896b90e825bdc89a61c99ece3def6c15c012a.tar
yuzu-b36896b90e825bdc89a61c99ece3def6c15c012a.tar.gz
yuzu-b36896b90e825bdc89a61c99ece3def6c15c012a.tar.bz2
yuzu-b36896b90e825bdc89a61c99ece3def6c15c012a.tar.lz
yuzu-b36896b90e825bdc89a61c99ece3def6c15c012a.tar.xz
yuzu-b36896b90e825bdc89a61c99ece3def6c15c012a.tar.zst
yuzu-b36896b90e825bdc89a61c99ece3def6c15c012a.zip