From 0be17ebb535f534d151070170ba9ecef9599a697 Mon Sep 17 00:00:00 2001
From: Abdessamad Derraz <3028866+Abdess@users.noreply.github.com>
Date: Fri, 23 Oct 2026 16:12:39 +0200
Subject: [PATCH] docs: name omicron's merge base as upstream pin

libretro/Omicron master is msx80/Omicron aaaa2f1 (2020-09-29) plus .gitlab-ci.yml and the core Makefile. Upstream HEAD 49e4e05 is 168 commits later and moved the libretro frontend files the notes cite.
---
 emulators/omicron.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/emulators/omicron.yml b/emulators/omicron.yml
index b406f0e7..356c3370 100644
--- a/emulators/omicron.yml
+++ b/emulators/omicron.yml
@@ -22,8 +22,9 @@ notes: |
   (omicron-player/omicron-loader/src/main/java/org/github/msx80/omicron/fantasyconsole/cartridges/JarCartridge.java:20-25,
   omicron-player/omicron-engine/src/main/java/org/github/msx80/omicron/GameRun.java:74-100).
   The libretro core is the experimental frontend of the same repository. The
-  libretro fork is the 2020-09-29 tree plus a GitLab CI file and a Makefile
-  that takes the JNI headers from JAVA_HOME. The CI builds the shared
+  libretro fork is the 2020-09-29 tree (upstream_commit, their merge base)
+  plus a GitLab CI file and a Makefile that takes the JNI headers from
+  JAVA_HOME. The CI builds the shared
   library for Linux x64, i686 and aarch64 only (.gitlab-ci.yml:48-66).
 
   retro_load_game builds <system_dir>/omicron/omicron.jar and refuses the