Merge branch 'dev' into ospf3
Showing
- NEWS 25 additions, 0 deletionsNEWS
- aclocal.m4 1 addition, 0 deletionsaclocal.m4
- client/client.c 13 additions, 7 deletionsclient/client.c
- conf/Makefile 3 additions, 1 deletionconf/Makefile
- configure.in 7 additions, 1 deletionconfigure.in
- doc/bird.sgml 38 additions, 3 deletionsdoc/bird.sgml
- doc/prog-head.sgml 2 additions, 1 deletiondoc/prog-head.sgml
- filter/config.Y 3 additions, 1 deletionfilter/config.Y
- filter/filter.c 28 additions, 7 deletionsfilter/filter.c
- filter/filter.h 3 additions, 0 deletionsfilter/filter.h
- filter/test.conf 1 addition, 0 deletionsfilter/test.conf
- filter/trie.c 1 addition, 1 deletionfilter/trie.c
- lib/birdlib.h 1 addition, 1 deletionlib/birdlib.h
- lib/event.c 0 additions, 4 deletionslib/event.c
- lib/mempool.c 1 addition, 4 deletionslib/mempool.c
- lib/resource.c 4 additions, 2 deletionslib/resource.c
- lib/slab.c 1 addition, 0 deletionslib/slab.c
- lib/socket.h 1 addition, 1 deletionlib/socket.h
- misc/bird.spec 1 addition, 1 deletionmisc/bird.spec
- nest/a-path.c 12 additions, 5 deletionsnest/a-path.c
Please register or sign in to comment