Alex 2e462e04d5 Resolve conflicts ...

All "confilcts" were actually diffs - not sure why git flew off the
handle.

2013-01-12 14:27:50 -06:00

..

dict

fixed text files

2012-11-11 13:56:24 +01:00

download

fixed text files

2012-11-11 13:56:24 +01:00

EchoServer

unbundled build fixes

2013-01-05 00:04:09 -06:00

HTTPFormServer

unbundled build fixes

2013-01-05 00:04:09 -06:00

httpget

fixed text files

2012-11-11 13:56:24 +01:00

HTTPLoadTest

unbundled build fixes

2013-01-05 00:04:09 -06:00

HTTPTimeServer

unbundled build fixes

2013-01-05 00:04:09 -06:00

ifconfig

Cygwin build (disable NetworkInterface)

2012-12-24 01:11:27 -06:00

Mail

fixed text files

2012-11-11 13:56:24 +01:00

Ping

unbundled build fixes

2013-01-05 00:04:09 -06:00

SMTPLogger

Resolve conflicts

2013-01-12 14:27:50 -06:00

TimeServer

unbundled build fixes

2013-01-05 00:04:09 -06:00

TwitterClient

unbundled build fixes

2013-01-05 00:04:09 -06:00

WebSocketServer

unbundled build fixes

2013-01-05 00:04:09 -06:00

CMakeLists.txt

added cmake support

2012-06-26 12:37:02 +00:00

dependencies

new trunk (base for 1.5)

2012-04-23 01:14:34 +00:00

Makefile

added ifconfig to samples Makefile

2012-12-14 15:30:24 -06:00

samples_CE_vs90.sln

added missing project files, etc.

2012-10-14 14:16:34 +00:00

samples_vs71.sln

added missing project files, etc.

2012-10-14 14:16:34 +00:00

samples_vs80.sln

added missing project files, etc.

2012-10-14 14:16:34 +00:00

samples_vs90.sln

added missing project files, etc.

2012-10-14 14:16:34 +00:00

samples_vs100.sln

ifconfig sample

2012-12-13 22:53:47 -06:00

samples_vs110.sln

fixed text files

2012-11-11 13:56:24 +01:00

samples_x64_vs90.sln

added missing project files, etc.

2012-10-14 14:16:34 +00:00

samples_x64_vs100.sln

added missing project files, etc.

2012-10-14 14:16:34 +00:00

samples_x64_vs110.sln

fixed text files

2012-11-11 13:56:24 +01:00

samples.progen

added missing project files, etc.

2012-10-14 14:16:34 +00:00