From 764b09df4c67d7f72fc3809c6bfe3e562ca6525c Mon Sep 17 00:00:00 2001
From: Michael Mandl <mandlm@molez.net>
Date: Sun, 22 Feb 2015 14:58:33 +0100
Subject: [PATCH] Project settings

---
 ProtoBufTest.sln | 28 ++++++++++++++++++++++++++++
 protobuf         |  2 +-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/ProtoBufTest.sln b/ProtoBufTest.sln
index 432a976..fe223de 100644
--- a/ProtoBufTest.sln
+++ b/ProtoBufTest.sln
@@ -7,6 +7,17 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Server", "Server\Server.vcx
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Client", "Client\Client.vcxproj", "{010C073D-B9CB-4FF6-8CA5-5029D6A6A2C7}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "protobuf", "protobuf", "{79C6CA55-40CE-4F5F-A29E-F06C0158D617}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libprotobuf", "protobuf\vsprojects\libprotobuf.vcxproj", "{3E283F37-A4ED-41B7-A3E6-A2D89D131A30}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libprotoc", "protobuf\vsprojects\libprotoc.vcxproj", "{B84FF31A-5F9A-46F8-AB22-DBFC9BECE3BE}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "protoc", "protobuf\vsprojects\protoc.vcxproj", "{1738D5F6-ED1E-47E0-B2F0-456864B93C1E}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B84FF31A-5F9A-46F8-AB22-DBFC9BECE3BE} = {B84FF31A-5F9A-46F8-AB22-DBFC9BECE3BE}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -21,8 +32,25 @@ Global
 		{010C073D-B9CB-4FF6-8CA5-5029D6A6A2C7}.Debug|Win32.Build.0 = Debug|Win32
 		{010C073D-B9CB-4FF6-8CA5-5029D6A6A2C7}.Release|Win32.ActiveCfg = Release|Win32
 		{010C073D-B9CB-4FF6-8CA5-5029D6A6A2C7}.Release|Win32.Build.0 = Release|Win32
+		{3E283F37-A4ED-41B7-A3E6-A2D89D131A30}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3E283F37-A4ED-41B7-A3E6-A2D89D131A30}.Debug|Win32.Build.0 = Debug|Win32
+		{3E283F37-A4ED-41B7-A3E6-A2D89D131A30}.Release|Win32.ActiveCfg = Release|Win32
+		{3E283F37-A4ED-41B7-A3E6-A2D89D131A30}.Release|Win32.Build.0 = Release|Win32
+		{B84FF31A-5F9A-46F8-AB22-DBFC9BECE3BE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B84FF31A-5F9A-46F8-AB22-DBFC9BECE3BE}.Debug|Win32.Build.0 = Debug|Win32
+		{B84FF31A-5F9A-46F8-AB22-DBFC9BECE3BE}.Release|Win32.ActiveCfg = Release|Win32
+		{B84FF31A-5F9A-46F8-AB22-DBFC9BECE3BE}.Release|Win32.Build.0 = Release|Win32
+		{1738D5F6-ED1E-47E0-B2F0-456864B93C1E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1738D5F6-ED1E-47E0-B2F0-456864B93C1E}.Debug|Win32.Build.0 = Debug|Win32
+		{1738D5F6-ED1E-47E0-B2F0-456864B93C1E}.Release|Win32.ActiveCfg = Release|Win32
+		{1738D5F6-ED1E-47E0-B2F0-456864B93C1E}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{3E283F37-A4ED-41B7-A3E6-A2D89D131A30} = {79C6CA55-40CE-4F5F-A29E-F06C0158D617}
+		{B84FF31A-5F9A-46F8-AB22-DBFC9BECE3BE} = {79C6CA55-40CE-4F5F-A29E-F06C0158D617}
+		{1738D5F6-ED1E-47E0-B2F0-456864B93C1E} = {79C6CA55-40CE-4F5F-A29E-F06C0158D617}
+	EndGlobalSection
 EndGlobal
diff --git a/protobuf b/protobuf
index bba8365..ba4dea9 160000
--- a/protobuf
+++ b/protobuf
@@ -1 +1 @@
-Subproject commit bba83652e1be610bdb7ee1566ad18346d98b843c
+Subproject commit ba4dea9fe8ad9e81ca605e3d91feb1823b943337