Bruno Jesus : ws2_32: Merge protocol.c and socket.c.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 03362e5a3dcc3a7dff8c5ba45c299a16ed3e3a70
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=03362e5a3dcc3a7dff8c5ba45c299a16ed3e3a70

Author: Bruno Jesus <00cpxxx at gmail.com>
Date:   Tue Sep  3 22:51:58 2013 -0300

ws2_32: Merge protocol.c and socket.c.

---

 dlls/ws2_32/Makefile.in |    1 -
 dlls/ws2_32/protocol.c  |  324 -----------------------------------------------
 dlls/ws2_32/socket.c    |  274 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 274 insertions(+), 325 deletions(-)

Diff:   http://source.winehq.org/git/wine.git/?a=commitdiff;h=03362e5a3dcc3a7dff8c5ba45c299a16ed3e3a70