diff options
| author | Ondrej Zajicek <santiago@crfreenet.org> | 2012-07-16 14:44:45 +0200 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2012-07-16 14:44:45 +0200 |
| commit | abced4a91495e27fe86b142bc1967cec53bab3dc (patch) | |
| tree | f6aead6b370caf7515855726e4e54ca7ee95224c /conf/conf.h | |
| parent | fc06fb62443c135773ee4c05ed83925cc47b046d (diff) | |
| parent | 761702644397886bd3c1be10fd55c01485b7c454 (diff) | |
Merge branch 'rt-accepted'
Conflicts:
nest/config.Y
nest/rt-table.c
proto/bgp/bgp.c
Diffstat (limited to 'conf/conf.h')
0 files changed, 0 insertions, 0 deletions