From abb02ae27504511787c502364bb3562e430b4e66 Mon Sep 17 00:00:00 2001 From: yuzubot Date: Sun, 17 Dec 2023 00:57:41 +0000 Subject: [PATCH] Android #163 --- README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/README.md b/README.md index d258584bf..e5ecb344f 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,13 @@ +| Pull Request | Commit | Title | Author | Merged? | +|----|----|----|----|----| +| [12304](https://github.com/yuzu-emu/yuzu//pull/12304) | [`fcc85abe2`](https://github.com/yuzu-emu/yuzu//pull/12304/files) | nvnflinger: mark buffer as acquired when acquired | [liamwhite](https://github.com/liamwhite/) | Yes | +| [12349](https://github.com/yuzu-emu/yuzu//pull/12349) | [`6851e9329`](https://github.com/yuzu-emu/yuzu//pull/12349/files) | Have GetActiveChannelCount return the system channels instead of host device channels | [Kelebek1](https://github.com/Kelebek1/) | Yes | + + +End of merge log. You can find the original README.md below the break. + +----- +