summaryrefslogtreecommitdiff
path: root/.frlog
diff options
context:
space:
mode:
authorSven-Thorsten Dietrich <sven@vyatta.com>2013-04-10 11:54:38 -0700
committerSven-Thorsten Dietrich <sven@vyatta.com>2013-04-10 11:54:38 -0700
commit7ac850bac7b1cc60d2b4518cfad2da533affee72 (patch)
treeb63daa7880d1cc5290647281aca549783a10ff3f /.frlog
parent9348acd0de2c4586d4ed8016a74edb77b097411c (diff)
parent8c48241fb647a46ae1b1f456d46d81e2001c5382 (diff)
downloadvyatta-cfg-quagga-7ac850bac7b1cc60d2b4518cfad2da533affee72.tar.gz
vyatta-cfg-quagga-7ac850bac7b1cc60d2b4518cfad2da533affee72.zip
Merge branch 'daisy' of http://git.vyatta.com/vyatta-cfg-quagga
Conflicts: debian/changelog
Diffstat (limited to '.frlog')
-rw-r--r--.frlog1
1 files changed, 1 insertions, 0 deletions
diff --git a/.frlog b/.frlog
index d1b22e9b..219cb369 100644
--- a/.frlog
+++ b/.frlog
@@ -3,3 +3,4 @@ Thu Jul 7 20:55:49 PDT 2011: [new branch] at [debian/0.18.137]
Sat Mar 3 02:25:35 PST 2012: [new branch] at [debian/0.18.148]
Wed Sep 26 15:56:10 PDT 2012: [Forced release] at [debian/0.18.157]
Fri Oct 12 19:46:55 PDT 2012: [new branch] at [debian/0.18.160]
+Sat Oct 13 13:30:40 PDT 2012: [create daisy branch] at [debian/0.18.161]