]> git.ipfire.org Git - thirdparty/mtr.git/commitdiff
projects / thirdparty / mtr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dd2b750 f3a9e05)
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)
Conflicts:
dns.c

1  2 
configure.ac patch | diff1 | diff2 | blob | history
net.c patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
diff --cc net.c
Simple merge
Mirror of https://github.com/traviscross/mtr.git