GlobalSound: send as tempentity

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

diff --git a/.tx/merge-base b/.tx/merge-base
index f84b550b33372799b9f8715101b87376e28ccd4f..699ec31da5d12b5258b2fedf33858473aef493bd 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Jan  6 00:02:56 CET 2015
+Wed Oct 14 01:54:07 CEST 2015