]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
Merge commit '4c2abee74e64f64fba61aad6e2b66e3895820003' into integrated
authorOndrej Zajicek <santiago@crfreenet.org>
Wed, 22 May 2013 13:46:29 +0000 (15:46 +0200)
committerOndrej Zajicek <santiago@crfreenet.org>
Wed, 22 May 2013 13:46:29 +0000 (15:46 +0200)
1  2 
conf/cf-lex.l
nest/config.Y
proto/ospf/config.Y
proto/static/static.c

diff --cc conf/cf-lex.l
Simple merge
diff --cc nest/config.Y
Simple merge
Simple merge
Simple merge