summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2014-01-08 23:43:19 +0100
committerDaniil Baturin <daniil@baturin.org>2014-01-08 23:43:19 +0100
commitf6c149482f3f4d5f2d046d6e612a95333b1f20af (patch)
treedcfff335088c4e8eff1f7cd1e4ad2face466a121
parent2616b9221c207f79033deb383fc339c13a98f537 (diff)
downloadconntrack-tools-f6c149482f3f4d5f2d046d6e612a95333b1f20af.tar.gz
conntrack-tools-f6c149482f3f4d5f2d046d6e612a95333b1f20af.zip
Revert "New branch". It was done in wrong branch.hydrogen
This reverts commit 089eff125e5b8a630460c5ad93cf2e6f20ecc0c5.
-rw-r--r--.frlog1
1 files changed, 0 insertions, 1 deletions
diff --git a/.frlog b/.frlog
index 1da4629..4e719bb 100644
--- a/.frlog
+++ b/.frlog
@@ -11,4 +11,3 @@ Mon Jun 4 21:31:23 PDT 2012: [forced release:cttimeout refreshed on build machi
Sat Oct 13 13:29:18 PDT 2012: [create daisy branch] at [debian/1.0.1-2+vyatta35]
Fri Dec 14 13:27:37 PST 2012: [force release: build failed due to race with libnetfilter-conntrack build] at [debian/1.0.1-2+vyatta35+daisy3]
Sat Nov 16 23:25:49 CET 2013: [New branch] at [debian/1.0.1-2+vyatta35+daisy4]
-Wed Jan 8 23:26:55 CET 2014: [New branch] at [debian/1.0.1-2+vyatta35+hydrogen1]