Merge from trunk and resolve conflicts.
authorEli Zaretskii <eliz@gnu.org>
Thu, 28 Mar 2013 18:13:59 +0000 (20:13 +0200)
committerEli Zaretskii <eliz@gnu.org>
Thu, 28 Mar 2013 18:13:59 +0000 (20:13 +0200)
commitd76bf86f438d4f5f9fe493ab76f02ffc78f3ae2e
tree04fa8bc7bd2058a316a7ee30f8741d25bfd0b060
parent2ef26ceb192c7683754cf0b4aa3087f501254332
parente74aeda863cd6896e06e92586f87b45d63d67d15
Merge from trunk and resolve conflicts.
configure.ac
nt/inc/sys/socket.h
nt/inc/sys/time.h
nt/inc/unistd.h