]> git.ipfire.org Git - thirdparty/bird.git/commit
Merge commit '354496ace87341428e6005fbc073fbe57b4e6c0e' into integrated
authorOndrej Zajicek <santiago@crfreenet.org>
Wed, 31 Jul 2013 16:33:55 +0000 (18:33 +0200)
committerOndrej Zajicek <santiago@crfreenet.org>
Wed, 31 Jul 2013 16:33:55 +0000 (18:33 +0200)
commit5ea2afcdcf423bbe7c836992ca62b8a07a55ccc5
tree3c79662944f4bf833551020a2128456b9490e7d2
parent3aae8f6ed87d1c59cf463756d30841b0442b49dc
parent354496ace87341428e6005fbc073fbe57b4e6c0e
Merge commit '354496ace87341428e6005fbc073fbe57b4e6c0e' into integrated

Conflicts:

sysdep/bsd/sysio.h
sysdep/unix/io.c
proto/ospf/iface.c
sysdep/bsd/sysio.h