]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
Merge branch 'master' into HEAD rpki
authorPavel Tvrdík <pawel.tvrdik@gmail.com>
Thu, 17 Dec 2015 15:58:45 +0000 (16:58 +0100)
committerPavel Tvrdík <pawel.tvrdik@gmail.com>
Thu, 17 Dec 2015 15:58:45 +0000 (16:58 +0100)
1  2 
nest/proto.c
nest/route.h

diff --cc nest/proto.c
Simple merge
diff --cc nest/route.h
Simple merge