summaryrefslogtreecommitdiffstats
path: root/.ci/scripts/merge
diff options
context:
space:
mode:
authorRodrigo Locatti <reinuseslisp@airmail.cc>2019-10-05 00:50:15 +0200
committerGitHub <noreply@github.com>2019-10-05 00:50:15 +0200
commitd6333978831a93ac641591f9e7bfd6fb2577c77b (patch)
treedfdddaef0045401bddd2b54e69e8d1a63aedf03d /.ci/scripts/merge
parentMerge pull request #2896 from FearlessTobi/port-4950 (diff)
parentSDL: Fix missing header (diff)
downloadyuzu-d6333978831a93ac641591f9e7bfd6fb2577c77b.tar
yuzu-d6333978831a93ac641591f9e7bfd6fb2577c77b.tar.gz
yuzu-d6333978831a93ac641591f9e7bfd6fb2577c77b.tar.bz2
yuzu-d6333978831a93ac641591f9e7bfd6fb2577c77b.tar.lz
yuzu-d6333978831a93ac641591f9e7bfd6fb2577c77b.tar.xz
yuzu-d6333978831a93ac641591f9e7bfd6fb2577c77b.tar.zst
yuzu-d6333978831a93ac641591f9e7bfd6fb2577c77b.zip