Fix merge conflicts with opus and update docs (0497bb55) · Commits · many-archive / Suyu · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

Suyu
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

0497bb55

There was an error fetching the commit references. Please try again later.

Commit 0497bb55 authored 6 years ago by Zach Hilman

Downloads
- Patches
- Plain Diff

Fix merge conflicts with opus and update docs

parent 187d8e21

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

.gitmodules 5 additions, 5 deletions

.gitmodules
src/core/CMakeLists.txt 1 addition, 1 deletion

src/core/CMakeLists.txt
src/core/loader/xci.cpp 2 additions, 0 deletions

src/core/loader/xci.cpp
src/yuzu/main.cpp 3 additions, 3 deletions

src/yuzu/main.cpp
src/yuzu_cmd/yuzu.cpp 2 additions, 2 deletions

src/yuzu_cmd/yuzu.cpp

with 13 additions and 11 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment