Merge branch 'dev' into ospf3
Conflicts: proto/ospf/lsreq.c proto/ospf/lsupd.c proto/ospf/rt.c
Showing
- NEWS 8 additions, 0 deletionsNEWS
- TODO 0 additions, 1 deletionTODO
- doc/bird.conf.example 1 addition, 0 deletionsdoc/bird.conf.example
- doc/bird.sgml 67 additions, 10 deletionsdoc/bird.sgml
- doc/reply_codes 3 additions, 0 deletionsdoc/reply_codes
- filter/filter.c 3 additions, 1 deletionfilter/filter.c
- misc/bird.spec 1 addition, 1 deletionmisc/bird.spec
- nest/config.Y 12 additions, 4 deletionsnest/config.Y
- nest/proto.c 82 additions, 11 deletionsnest/proto.c
- nest/protocol.h 18 additions, 0 deletionsnest/protocol.h
- nest/rt-table.c 70 additions, 13 deletionsnest/rt-table.c
- proto/bgp/attrs.c 25 additions, 3 deletionsproto/bgp/attrs.c
- proto/bgp/bgp.c 16 additions, 0 deletionsproto/bgp/bgp.c
- proto/bgp/bgp.h 9 additions, 0 deletionsproto/bgp/bgp.h
- proto/bgp/config.Y 8 additions, 1 deletionproto/bgp/config.Y
- proto/bgp/packets.c 97 additions, 15 deletionsproto/bgp/packets.c
- proto/ospf/lsupd.c 23 additions, 15 deletionsproto/ospf/lsupd.c
- proto/pipe/pipe.c 19 additions, 6 deletionsproto/pipe/pipe.c
- sysdep/config.h 1 addition, 1 deletionsysdep/config.h
- sysdep/unix/main.c 15 additions, 5 deletionssysdep/unix/main.c
Please register or sign in to comment