diff options
| author | rbalocca <rbalocca@vyatta.com> | 2008-03-22 18:04:15 -0700 |
|---|---|---|
| committer | rbalocca <rbalocca@vyatta.com> | 2008-03-22 18:04:15 -0700 |
| commit | 9c7c83a5e701f7efcee11f7ce46361f841dc29b6 (patch) | |
| tree | fd1b505390d3c19441767de2ac7678fb11a63e17 /.gitignore | |
| parent | 4f86a2a56c09f0731e401aa2fe0ae5717f7830c1 (diff) | |
| parent | f279d69e1d3952de1231ecf56d6ebb3023b96645 (diff) | |
| download | vyatta-cfg-quagga-9c7c83a5e701f7efcee11f7ce46361f841dc29b6.tar.gz vyatta-cfg-quagga-9c7c83a5e701f7efcee11f7ce46361f841dc29b6.zip | |
Merge branch 'glendale' into hollywood
Conflicts:
debian/control
scripts/install-system
scripts/rl-system.init
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions