]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
Merge commit 'a9c38203bdcad92f7ac0a8a912241d2acb483f2c' into integrated
authorOndrej Zajicek <santiago@crfreenet.org>
Wed, 22 May 2013 13:46:55 +0000 (15:46 +0200)
committerOndrej Zajicek <santiago@crfreenet.org>
Wed, 22 May 2013 13:46:55 +0000 (15:46 +0200)
1  2 
nest/config.Y
proto/rip/rip.c
proto/rip/rip.h

diff --cc nest/config.Y
Simple merge
diff --cc proto/rip/rip.c
Simple merge
diff --cc proto/rip/rip.h
Simple merge