summaryrefslogtreecommitdiffstats
path: root/.ci/templates/merge.yml
diff options
context:
space:
mode:
authorJames Rowe <jroweboy@gmail.com>2020-05-09 02:49:33 +0200
committerJames Rowe <jroweboy@gmail.com>2020-05-09 02:49:33 +0200
commitdd449ce4627119776393bcc224f152af970b8ff1 (patch)
tree6308de28a6ca7e604b59346ad61103f3ca8dc072 /.ci/templates/merge.yml
parentReplace externals with Conan (#3735) (diff)
downloadyuzu-dd449ce4627119776393bcc224f152af970b8ff1.tar
yuzu-dd449ce4627119776393bcc224f152af970b8ff1.tar.gz
yuzu-dd449ce4627119776393bcc224f152af970b8ff1.tar.bz2
yuzu-dd449ce4627119776393bcc224f152af970b8ff1.tar.lz
yuzu-dd449ce4627119776393bcc224f152af970b8ff1.tar.xz
yuzu-dd449ce4627119776393bcc224f152af970b8ff1.tar.zst
yuzu-dd449ce4627119776393bcc224f152af970b8ff1.zip