From: Mikko Rasa <tdb@tdb.fi>
Date: Wed, 10 Aug 2011 18:14:42 +0000 (+0300)
Subject: Merge branch 'http-master'
X-Git-Url: http://git.tdb.fi/?p=libs%2Fnet.git;a=commitdiff_plain;h=debe1004676d5431e571d9c4361072661dcc88c4

Merge branch 'http-master'

Conflicts:
	.gitignore
	Build
---

debe1004676d5431e571d9c4361072661dcc88c4
diff --cc Build
index 444fc30,f602417..1ed9db8
--- a/Build
+++ b/Build
@@@ -1,32 -1,15 +1,39 @@@
 -package "msphttp"
 +package "mspnet"
  {
 -	description "HTTP client and server library";
 -	version "0.1";
 +	require "mspcore";
 +	if "arch=win32"
 +	{
 +		build_info
 +		{
 +			library "ws2_32";
 +		};
 +	};
 +
 +	headers "msp/net"
 +	{
 +		source "source/net";
 +		install true;
 +	};
  
 -	require "mspnet";
 -	require "mspstrings";
++	headers "msp/http"
++	{
++		source "source/http";
++		install true;
++	};
+ 
 -	library "msphttp"
 +	library "mspnet"
  	{
 -		source "source";
 +		source "source/net";
++		source "source/http";
  		install true;
 -		install_headers "msp/http";
 +	};
 +
 +	program "netcat"
 +	{
 +		source "examples/netcat.cpp";
 +		build_info
 +		{
 +			library "mspnet";
 +		};
  	};
  };