X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=0a6c1be65891f10624a19f2b58eacad00bde95f2;hb=50ac0ea247e3f106ea2c0b23a5c116cd4956394e;hp=ac5115594ba2794295377369b10796c9f560bd78;hpb=15585913a7e3eb6bd1ec6fce51c8dca0f61ce672;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index ac5115594..0a6c1be65 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Oct 16 07:24:02 CEST 2022
+Thu Jan 19 07:23:31 CET 2023