]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6c42322)
Oops. Why wasn't merge-base updated...
authorRudolf Polzer <divverent@xonotic.org>
Fri, 4 Oct 2013 11:03:20 +0000 (13:03 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Fri, 4 Oct 2013 11:03:20 +0000 (13:03 +0200)
.tx/merge-base patch | blob | history

diff --git a/.tx/merge-base b/.tx/merge-base
index 1defbff2760f7026bc6ffe09a6d253be67bb592c..fa97f6f95163f1e6c766bf3fda1093ccb3d03b89 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Sep 13 21:26:35 CEST 2013
+Fri Oct  4 13:03:13 CEST 2013