diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-09-08 08:24:09 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-09-08 08:24:09 -0700 |
| commit | 134f35f838d444d63a1774b986380264e7089c6e (patch) | |
| tree | f720a657594a52bdb611dabef15b85ae531ffce5 /.merge-branch-exclude | |
| parent | b1c8827efedc245d47f89cf8b4db30f495498ae7 (diff) | |
| parent | 5a4ac0f6fc5fa0a25663f7834fef4cbd5ba98ecd (diff) | |
| download | vyatta-cfg-134f35f838d444d63a1774b986380264e7089c6e.tar.gz vyatta-cfg-134f35f838d444d63a1774b986380264e7089c6e.zip | |
Merge branch 'mendocino' of suva.vyatta.com:/git/vyatta-cfg into mendocino
Diffstat (limited to '.merge-branch-exclude')
| -rw-r--r-- | .merge-branch-exclude | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.merge-branch-exclude b/.merge-branch-exclude new file mode 100644 index 0000000..461c816 --- /dev/null +++ b/.merge-branch-exclude @@ -0,0 +1,4 @@ +6521907e2deb6b13a9048334d70657a2c4f12b73 +fdcf5294b4a60c2a1a75e40442cb09b58e470885 +4935b31eb6b6c755f7ce3e0102a60996c1b1d633 + |