mirror of
https://github.com/JustinZeus/Wholphin.git
synced 2026-07-08 23:51:21 +02:00
Merge branch 'main' into develop/mpv
This commit is contained in:
commit
7acefe4ba3
14 changed files with 370 additions and 151 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -53,6 +53,7 @@ app/libs/
|
|||
ffmpeg_decoder/
|
||||
app/release/
|
||||
app/debug/
|
||||
<<<<<<< HEAD
|
||||
|
||||
# mpv
|
||||
app/src/main/obj/
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue