Ameer 4489ea6f53 Rebase to master, fix merge conflicts

2020-07-08 21:15:49 -04:00

..

audio_core

Audio: Correct buffer release for host timing.

2020-06-27 11:36:23 -04:00

common

Revert "cmake: fix fmt linking"

2020-07-02 22:53:12 -04:00

core

Merge pull request #4243 from CrazyMax/display_version

2020-07-08 10:46:56 -04:00

input_common

Rebase to master, fix merge conflicts

2020-07-08 21:15:49 -04:00

tests

Core/Common: Address Feedback.

2020-06-27 18:20:06 -04:00

video_core

Merge pull request #4150 from ReinUsesLisp/dynamic-state-impl

2020-07-07 10:58:09 -04:00

web_service

Replace externals with Conan (#3735)

2020-05-08 17:09:29 -04:00

yuzu

Merge pull request #4255 from lioncash/copy

2020-07-08 16:28:10 -04:00

yuzu_cmd

General: Setup yuzu threads' microprofile, naming and registry.

2020-06-27 11:35:09 -04:00

yuzu_tester

General: Setup yuzu threads' microprofile, naming and registry.

2020-06-27 11:35:09 -04:00

.clang-format

…

CMakeLists.txt

Build System: Fix GCC & MINGW Build.

2020-06-27 11:36:28 -04:00