summaryrefslogtreecommitdiff
path: root/.frlog
diff options
context:
space:
mode:
authorJohn Southworth <john.southworth@vyatta.com>2013-04-10 15:50:37 -0700
committerJohn Southworth <john.southworth@vyatta.com>2013-04-10 15:50:37 -0700
commit4e23b5d5f575c32a704c704d0439f6f06553fa3d (patch)
tree62ecbea05c10089c5d2dc25018d37f859744a5ce /.frlog
parent19a56feaae95a3235dad7ee19ab338ace8aed587 (diff)
parent208f5cc0ac36368cde1fdb31786dd8011d055d7c (diff)
downloadvyatta-cfg-quagga-4e23b5d5f575c32a704c704d0439f6f06553fa3d.tar.gz
vyatta-cfg-quagga-4e23b5d5f575c32a704c704d0439f6f06553fa3d.zip
Merge branch 'master' of git.vyatta.com:/git/vyatta-cfg-quagga
Diffstat (limited to '.frlog')
-rw-r--r--.frlog2
1 files changed, 2 insertions, 0 deletions
diff --git a/.frlog b/.frlog
index d1b22e9b..4848ad55 100644
--- a/.frlog
+++ b/.frlog
@@ -3,3 +3,5 @@ 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]
+Wed Apr 10 13:55:46 PDT 2013: [Daisy merge] at [debian/0.18.166]