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 12e22e55744578d3ad8135aac71ec33813f92f0e..d795790ea67bc092e05c23ce192699edd502f2d3 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Sep  2 07:24:05 CEST 2018
+Fri May 24 07:24:30 CEST 2019