From 78b9962e2b1b37a1530473f59b9c2cb0fbc82b25 Mon Sep 17 00:00:00 2001 From: citrabot Date: Tue, 22 Aug 2017 13:36:48 +0000 Subject: [PATCH] Canary #7 Merged: j-selby: Canary Base Merged: chris062689: Test PR -- Please ignore. Merged: wwylele: PICA: implemented geometry shader Merged: MerryMage: interpolate: Interpolate on a frame-by-frame basis Merged: Subv: Kernel/Memory: Give each process its own page table and allow switching the current page table upon reschedule Merged: Subv: Services/UDS: Handle beacon frames and the basic AP connection sequence frames. --- README.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/README.md b/README.md index 2e4f4b0a1..bc64aac05 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,21 @@ +# 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| +|[2890](https://github.com/citra-emu/citra/pull/2890)|Test PR -- Please ignore.|chris062689|true| +|[2865](https://github.com/citra-emu/citra/pull/2865)|PICA: implemented geometry shader|wwylele|true| +|[2858](https://github.com/citra-emu/citra/pull/2858)|interpolate: Interpolate on a frame-by-frame basis|MerryMage|true| +|[2842](https://github.com/citra-emu/citra/pull/2842)|Kernel/Memory: Give each process its own page table and allow switching the current page table upon reschedule|Subv|true| +|[2831](https://github.com/citra-emu/citra/pull/2831)|Services/UDS: Handle beacon frames and the basic AP connection sequence frames.|Subv|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!!!** The Citra Emulator