]> git.ipfire.org Git - thirdparty/mtr.git/commit
Merge remote-tracking branch 'origin/master' into newdns 111/head
authorAntonio Querubin <tony@lavanauts.org>
Sat, 30 Apr 2016 11:42:41 +0000 (01:42 -1000)
committerAntonio Querubin <tony@lavanauts.org>
Sat, 30 Apr 2016 11:42:41 +0000 (01:42 -1000)
commite56513911787c7fc58edfc18f5c6d8d6d7ecd19d
tree25e63ce49bfbe6f03c547f31aa8c1a7fe9a18ee9
parentdd2b75080bc5406ba0b438953b36b72204ba114b
parentf3a9e054323fcae278aa397f5cd2edfdb3f32928
Merge remote-tracking branch 'origin/master' into newdns

Conflicts:
dns.c
configure.ac
net.c