« Previous | Next » 

Revision abced4a9

IDabced4a91495e27fe86b142bc1967cec53bab3dc
Parent fc06fb62, 76170264
Child 4be266a9

Added by Ondrej Zajicek almost 9 years ago

Merge branch 'rt-accepted'

Conflicts:

nest/config.Y
    nest/rt-table.c
    proto/bgp/bgp.c

Files

  • added
  • modified
  • copied
  • renamed
  • deleted