# Conflicts:
#   CMakeLists.txt
#   CMakeModules/DownloadExternals.cmake

Revert "Merge branch 'master' into 'dev'"

See merge request suyu-emu/suyu!24

This reverts merge request !17

Update README.md

See merge request suyu-emu/suyu!21

Fix typo in README.md

See merge request suyu-emu/suyu!22

Fixed wiki links in README.md

See merge request suyu2/suyu!7

Update README.md

See merge request suyu2/suyu!8

Fixed link in CONTRIBUTING.md

See merge request suyu2/suyu!6

Fix Linux compile

See merge request suyu2/suyu!9

modifying all the files to match the app

See merge request suyu2/suyu!17

Update README.md

See merge request suyu2/suyu!14

Update path names from yuzu to suyu

See merge request suyu2/suyu!5

Merge suyu history with yuzu history

Closes #6

See merge request suyu2/suyu!3

Point to proper suyu org forks

See merge request suyu2/suyu!4

Submodules at their right revisions

See merge request suyu2/suyu!1

 On branch master
 Your branch is up to date with 'origin/master'.

 Changes to be committed:
	new file:   .ci/.DS_Store
	new file:   .ci/scripts/android/build.sh
	new file:   .ci/scripts/android/eabuild.sh
	new file:   .ci/scripts/android/mainlinebuild.sh
	new file:   .ci/scripts/android/upload.sh
	new file:   .ci/scripts/clang/docker.sh
	new file:   .ci/scripts/clang/exec.sh
	new file:   .ci/scripts/clang/upload.sh
	new file:   .ci/scripts/common/post-upload.sh
	new file:   .ci/scripts/common/pre-upload.sh
	new file:   .ci/scripts/format/docker.sh
	new file:   .ci/scripts/format/exec.sh
	new file:   .ci/scripts/format/script.sh
	new file:   .ci/scripts/linux/docker.sh
	new file:   .ci/scripts/linux/exec.sh
	new file:   .ci/scripts/linux/upload.sh
	new file:   .ci/scripts/merge/apply-patches-by-label-private.py
	new file:   .ci/scripts/merge/apply-patches-by-label.py
	new file:   .ci/scripts/merge/check-label-presence.py
	new file:   .ci/scripts/merge/yuzubot-git-config.sh
	new file:   .ci/scripts/transifex/docker.sh
	new file:   .ci/scripts/windows/docker.sh
	new file:   .ci/scripts/windows/exec.sh
	new file:   .ci/scripts/windows/install-vulkan-sdk.ps1
	new file:   .ci/scripts/windows/scan_dll.py
	new file:   .ci/scripts/windows/upload.ps1
	new file:   .ci/scripts/windows/upload.sh
	new file:   .ci/templates/build-mock.yml
	new file:   .ci/templates/build-msvc.yml
	new file:   .ci/templates/build-single.yml
	new file:   .ci/templates/build-standard.yml
	new file:   .ci/templates/build-testing.yml
	new file:   .ci/templates/format-check.yml
	new file:   .ci/templates/merge-private.yml
	new file:   .ci/templates/merge.yml
	new file:   .ci/templates/mergebot-private.yml
	new file:   .ci/templates/mergebot.yml
	new file:   .ci/templates/release-download.yml
	new file:   .ci/templates/release-github.yml
	new file:   .ci/templates/release-private-tag.yml
	new file:   .ci/templates/release-universal.yml
	new file:   .ci/templates/retrieve-artifact-source.yml
	new file:   .ci/templates/retrieve-master-source.yml
	new file:   .ci/templates/sync-source.yml
	new file:   .ci/yuzu-mainline-step1.yml
	new file:   .ci/yuzu-mainline-step2.yml
	new file:   .ci/yuzu-patreon-step1.yml
	new file:   .ci/yuzu-patreon-step2.yml
	new file:   .ci/yuzu-repo-sync.yml
	new file:   .ci/yuzu-verify.yml
	new file:   .codespellrc
	new file:   .git-blame-ignore-revs
	new file:   .gitattributes
	new file:   .gitignore
	new file:   .gitmodules
	new file:   .reuse/dep5