summaryrefslogtreecommitdiffstats
path: root/.ci/scripts/merge
diff options
context:
space:
mode:
authorZach Hilman <zachhilman@gmail.com>2019-09-26 15:28:59 +0200
committerZach Hilman <zachhilman@gmail.com>2019-09-26 15:28:59 +0200
commitab8d122384a5ccec3ec20b289a2ae68c52501547 (patch)
tree8d6fd7245f217e8b6c8f6255a367890ef4fa24d0 /.ci/scripts/merge
parentMerge pull request #2869 from ReinUsesLisp/suld (diff)
downloadyuzu-ab8d122384a5ccec3ec20b289a2ae68c52501547.tar
yuzu-ab8d122384a5ccec3ec20b289a2ae68c52501547.tar.gz
yuzu-ab8d122384a5ccec3ec20b289a2ae68c52501547.tar.bz2
yuzu-ab8d122384a5ccec3ec20b289a2ae68c52501547.tar.lz
yuzu-ab8d122384a5ccec3ec20b289a2ae68c52501547.tar.xz
yuzu-ab8d122384a5ccec3ec20b289a2ae68c52501547.tar.zst
yuzu-ab8d122384a5ccec3ec20b289a2ae68c52501547.zip