Raw work with Gimp to mostly fix glow part of megaerebus textures (normal map unchang...

[xonotic/xonotic-data.pk3dir.git] / .tx / merge-base

diff --git a/.tx/merge-base b/.tx/merge-base
index 3512ca5dc542939aff93cadaafcc1544cf16655e..d795790ea67bc092e05c23ce192699edd502f2d3 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Sep 30 07:24:04 CEST 2018
+Fri May 24 07:24:30 CEST 2019