]> granicus.if.org Git - libevent/commitdiff
Merge pull request #212 from xbao/master
authorNick Mathewson <nickm@freehaven.net>
Tue, 3 Feb 2015 20:57:31 +0000 (15:57 -0500)
committerNick Mathewson <nickm@freehaven.net>
Tue, 3 Feb 2015 20:57:31 +0000 (15:57 -0500)
changed strtotimeval signature to avoid conflict with Android NDK sys/time.h header (#211)

1  2 
evdns.c

diff --cc evdns.c
Simple merge