Skip to content

GitLab

Update to v106r52 release. 

byuu says:

I stand corrected, I managed to create and even larger diff than ever.
This one weighs in at 309KiB `>__>`

I'll have to create a changelog later, I'm too tired right now to go
through all of that.
5 jobs for master in 17 minutes and 26 seconds (queued for 3 seconds)
22bd4b92
No related merge requests found.
Status Name Job ID Coverage
  Test
passed bsnes-linux-x86_64-binaries #84282026

00:08:36

passed bsnes-windows-x86_64-binaries #84282028

00:08:21

passed higan-linux-x86_64-binaries #84282024

00:09:17

passed higan-windows-x86_64-binaries #84282027

00:17:19

failed libretro-test #84282029

00:02:35

 
Name Stage Failure
failed
libretro-test Test 
0 added, 0 removed; done.
Running hooks in /etc/ca-certificates/update.d...
done.
$ EMAIL=fake-email@example.com git merge origin/libretro
Auto-merging icarus/core/core.hpp
Auto-merging icarus/core/core.cpp
CONFLICT (content): Merge conflict in icarus/core/core.cpp
Automatic merge failed; fix conflicts and then commit the result.
ERROR: Job failed: exit code 1