Fix Jetpack Regenerator time, it wasn't networked

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 9322cbe40aab30cd8f203a217ebc95611c84f251..b2b2ddca631fe972b7a6fe63d6ecdf789d678128 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Aug  8 12:41:53 CEST 2015
+Fri Jan 15 22:48:00 CET 2016