X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=.tx%2Fmerge-base;h=6a5ba5668edb9b4498d57c1384b8649a656c3d78;hb=f1ea786ae4cfc349fe4916f05995e10874075c90;hp=f91678e3679ca1319d64b136fed8b8413e0050f3;hpb=fae0e8e8c3c4cad61ac0eb880ac7ce819a300b3c;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index f91678e36..6a5ba5668 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Jan 15 17:04:50 CET 2016
+Fri Jun  2 07:23:54 CEST 2017