diff options
| author | malosek <malosek@fastmq.com> | 2009-09-15 12:01:07 +0200 |
|---|---|---|
| committer | malosek <malosek@fastmq.com> | 2009-09-15 12:01:07 +0200 |
| commit | 79d4a6debf2f4a6970c1137f15426ba0c3535ac0 (patch) | |
| tree | ab3a96e41fc94f1fc1742cfbf5a5b3ad8b524a9e | |
| parent | 7653f34df0aae4689d0ccc563a2f111f4793e539 (diff) | |
| parent | 98b8e9b54dd8c67006422106b478a3a6eab07869 (diff) | |
Merge branch 'master' of git@github.com:sustrik/zeromq2
| -rw-r--r-- | msvc/msvc.sln | 10 | ||||
| -rw-r--r-- | msvc/zmq_forwarder/zmq_forwarder.vcproj (renamed from msvc/forwarder/forwarder.vcproj) | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/msvc/msvc.sln b/msvc/msvc.sln index 139a8df..8b7d8d0 100644 --- a/msvc/msvc.sln +++ b/msvc/msvc.sln @@ -73,7 +73,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python", "python\python.vcp {641C5F36-32EE-4323-B740-992B651CF9D6} = {641C5F36-32EE-4323-B740-992B651CF9D6} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "forwarder", "forwarder\forwarder.vcproj", "{7529DFB2-685C-4534-B40E-0B148509178A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zmq_forwarder", "zmq_forwarder\zmq_forwarder.vcproj", "{EFE471DE-6747-4B2E-B084-F7E45A16CD03}" ProjectSection(ProjectDependencies) = postProject {641C5F36-32EE-4323-B740-992B651CF9D6} = {641C5F36-32EE-4323-B740-992B651CF9D6} EndProjectSection @@ -143,10 +143,10 @@ Global {CB9B47E2-3F9C-45B2-9C30-C27038CDB856}.Debug|Win32.ActiveCfg = Debug|Win32 {CB9B47E2-3F9C-45B2-9C30-C27038CDB856}.Release|Win32.ActiveCfg = Release|Win32 {CB9B47E2-3F9C-45B2-9C30-C27038CDB856}.Release|Win32.Build.0 = Release|Win32 - {7529DFB2-685C-4534-B40E-0B148509178A}.Debug|Win32.ActiveCfg = Debug|Win32 - {7529DFB2-685C-4534-B40E-0B148509178A}.Debug|Win32.Build.0 = Debug|Win32 - {7529DFB2-685C-4534-B40E-0B148509178A}.Release|Win32.ActiveCfg = Release|Win32 - {7529DFB2-685C-4534-B40E-0B148509178A}.Release|Win32.Build.0 = Release|Win32 + {EFE471DE-6747-4B2E-B084-F7E45A16CD03}.Debug|Win32.ActiveCfg = Debug|Win32 + {EFE471DE-6747-4B2E-B084-F7E45A16CD03}.Debug|Win32.Build.0 = Debug|Win32 + {EFE471DE-6747-4B2E-B084-F7E45A16CD03}.Release|Win32.ActiveCfg = Release|Win32 + {EFE471DE-6747-4B2E-B084-F7E45A16CD03}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/msvc/forwarder/forwarder.vcproj b/msvc/zmq_forwarder/zmq_forwarder.vcproj index 4e704b9..b71f6a4 100644 --- a/msvc/forwarder/forwarder.vcproj +++ b/msvc/zmq_forwarder/zmq_forwarder.vcproj @@ -2,9 +2,9 @@ <VisualStudioProject ProjectType="Visual C++" Version="9.00" - Name="forwarder" - ProjectGUID="{7529DFB2-685C-4534-B40E-0B148509178A}" - RootNamespace="forwarder" + Name="zmq_forwarder" + ProjectGUID="{EFE471DE-6747-4B2E-B084-F7E45A16CD03}" + RootNamespace="zmq_forwarder" TargetFrameworkVersion="196613" > <Platforms> @@ -164,7 +164,7 @@ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > <File - RelativePath="..\..\devices\forwarder\forwarder.cpp" + RelativePath="..\..\devices\zmq_forwarder\zmq_forwarder.cpp" > </File> </Filter> |