Merge branch 'AlexVallat/ProtocolBuffers'

src/KeePassLib2Android/Serialization/ProtoBuf/KdbpFile.cs

@@ -95,7 +95,7 @@ namespace KeePassLib.Serialization
 			#endregion
 
 			#region Deserialization
-			private PwDatabaseBuffer()
+			public PwDatabaseBuffer()
 			{
 			}
 
@@ -315,7 +315,7 @@ namespace KeePassLib.Serialization
 			#endregion
 
 			#region Deserialization
-			private StringDictionaryExBuffer()
+			public StringDictionaryExBuffer()
 			{
 				mStringDictionaryEx = new StringDictionaryEx();
 			}
@@ -385,7 +385,7 @@ namespace KeePassLib.Serialization
 			#endregion
 
 			#region Deserialization
-			private PwCustomIconBuffer()
+			public PwCustomIconBuffer()
 			{
 			}
 
@@ -418,7 +418,7 @@ namespace KeePassLib.Serialization
 			#endregion
 
 			#region Deserialization
-			private MemoryProtectionConfigBuffer()
+			public MemoryProtectionConfigBuffer()
 			{
 				mMemoryProtectionConfig = new MemoryProtectionConfig();
 			}
@@ -478,7 +478,7 @@ namespace KeePassLib.Serialization
 			#endregion
 
 			#region Deserialization
-			private PwDeletedObjectListBuffer()
+			public PwDeletedObjectListBuffer()
 				: base()
 			{
 			}
@@ -503,7 +503,7 @@ namespace KeePassLib.Serialization
 			#endregion
 
 			#region Deserialization
-			private PwDeletedObjectBuffer()
+			public PwDeletedObjectBuffer()
 			{
 				mDeletedObject = new PwDeletedObject();
 			}
@@ -543,7 +543,7 @@ namespace KeePassLib.Serialization
 			#endregion
 
 			#region Deserialization
-			private PwGroupBuffer()
+			public PwGroupBuffer()
 			{
 				mGroup = new PwGroup(false, false);
 				mEntries = new PwGroupEntryListBuffer(mGroup);
@@ -790,7 +790,7 @@ namespace KeePassLib.Serialization
 			#endregion
 
 			#region Deserialization
-			private PwEntryListBuffer()
+			public PwEntryListBuffer()
 				: base()
 			{
 			}
@@ -830,7 +830,7 @@ namespace KeePassLib.Serialization
 			#endregion
 
 			#region Deserialization
-			private PwEntryBuffer()
+			public PwEntryBuffer()
 			{
 				mEntry = new PwEntry(false, false);
 				mEntryStandardStrings = new ProtectedStandardFieldDictionaryBuffer(mEntry.Strings);
@@ -1177,7 +1177,7 @@ namespace KeePassLib.Serialization
 			#endregion
 
 			#region Deserialisation
-			private ProtectedStringBuffer()
+			public ProtectedStringBuffer()
 			{
 			}
 
@@ -1281,7 +1281,7 @@ namespace KeePassLib.Serialization
 			#endregion
 
 			#region Deserialisation
-			private NamedProtectedBinaryBuffer()
+			public NamedProtectedBinaryBuffer()
 			{
 			}
 
@@ -1327,7 +1327,7 @@ namespace KeePassLib.Serialization
 			#endregion
 
 			#region Deserialization
-			private AutoTypeConfigBuffer()
+			public AutoTypeConfigBuffer()
 			{
 				mAutoTypeConfig = new AutoTypeConfig();
 				mAutoTypeAssociationsBuffer = new AutoTypeAssociationsBuffer(mAutoTypeConfig);
@@ -1410,7 +1410,7 @@ namespace KeePassLib.Serialization
 			#endregion
 
 			#region Deserialization
-			private AutoTypeAssociationBuffer()
+			public AutoTypeAssociationBuffer()
 			{
 				mAutoTypeAssociation = new AutoTypeAssociation();
 			}

src/ProtoBuf/Licence.txt

@@ -0,0 +1,20 @@
+The core Protocol Buffers technology is provided courtesy of Google.
+At the time of writing, this is released under the BSD license.
+Full details can be found here:
+
+http://code.google.com/p/protobuf/
+
+
+This .NET implementation is Copyright 2008 Marc Gravell
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

src/ProtoBuf/Readme.txt

@@ -0,0 +1,2 @@
+The contents of this folder were generated by compiling the protobuf-net_MonoDroid project
+from the http://code.google.com/p/protobuf-net source code