diff --git a/README.md b/README.md index 31f5afe27..4d1606916 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,19 @@ +# Merge log + +Scroll down for the original README.md! + +|PR Number|Title|Author|Merge Success| +|----|----|----|----| +|[2](https://github.com/citra-emu/citra-canary/pull/2)|Canary Base|j-selby|true| +|[3001](https://github.com/citra-emu/citra/pull/3001)|citra-qt : Adding fullscreen mode|Styleoshin|true| +|[2997](https://github.com/citra-emu/citra/pull/2997)|Updater QT Integration|j-selby|false| +|[2969](https://github.com/citra-emu/citra/pull/2969)|Service/PTM: Stub GetStepHistory function|mailwl|true| + + +End of merge log. You can find the original README.md below the break. + +------ + **BEFORE FILING AN ISSUE, READ THE RELEVANT SECTION IN THE [CONTRIBUTING](https://github.com/citra-emu/citra/blob/master/CONTRIBUTING.md#reporting-issues) FILE!!!** Citra Emulator