]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
Merge commit '36da2857bc911924a250a234f38cf58c3b21f1bc' into integrated
authorOndrej Zajicek <santiago@crfreenet.org>
Wed, 22 May 2013 13:45:23 +0000 (15:45 +0200)
committerOndrej Zajicek <santiago@crfreenet.org>
Wed, 22 May 2013 13:45:23 +0000 (15:45 +0200)
1  2 
filter/filter.c
nest/route.h
nest/rt-table.c
proto/radv/packets.c
proto/radv/radv.h

diff --cc filter/filter.c
Simple merge
diff --cc nest/route.h
Simple merge
diff --cc nest/rt-table.c
Simple merge
Simple merge
Simple merge