Commits

Alexander Kojevnikov authored 95eeda3340fM
Merge remote-tracking branch 'lunchtimemama/master' A little bit of history. Mono.Upnp was originally developed on the Mono's SVN repository. Scott (lunchtimemama) started with the latest trunk at that time and developed it further on GitHub. Mono later migrated all SVN repos to Git, however mono/mono-upnp and lunchtimemama/Mono.Upnp had no common commits until now. This commit merges in Scott's master branch and "resolves" all conflicts by copying over its contents. The plan is to merge in relevant changes from other forks and to make mono/mono-upnp the main repository. Conflicts: AUTHORS COPYING HACKING Mono.Upnp.sln README src/Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.Internal/AsyncReceiveBuffer.cs src/Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.Internal/HttpDatagram.cs src/Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.Internal/HttpDatagramType.cs src/Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.Internal/Log.cs src/Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.Internal/NotifyListener.cs src/Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.Internal/RequestListener.cs src/Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.Internal/SsdpSocket.cs src/Mono.Ssdp/Mono.Ssdp/Mono.Ssdp.csproj src/Mono.Ssdp/Mono.Ssdp/Mono.Ssdp/Announcer.cs src/Mono.Ssdp/Mono.Ssdp/Mono.Ssdp/Browser.cs src/Mono.Ssdp/Mono.Ssdp/Mono.Ssdp/Client.cs src/Mono.Ssdp/Mono.Ssdp/Mono.Ssdp/MulticastReader.cs src/Mono.Ssdp/Mono.Ssdp/Mono.Ssdp/Server.cs src/Mono.Ssdp/Mono.Ssdp/Mono.Ssdp/ServiceArgs.cs src/Mono.Ssdp/Mono.Ssdp/Mono.Ssdp/ServiceHandler.cs src/Mono.Upnp/Mono.Upnp/AssemblyInfo.cs src/Mono.Upnp/Mono.Upnp/Mono.Upnp.Xml/IXmlDeserializable.cs src/Mono.Upnp/Mono.Upnp/Mono.Upnp.Xml/IXmlSerializable.cs src/Mono.Upnp/Mono.Upnp/Mono.Upnp.Xml/XmlArrayAttribute.cs src/Mono.Upnp/Mono.Upnp/Mono.Upnp.Xml/XmlArrayItemAttribute.cs src/Mono.Upnp/Mono.Upnp/Mono.Upnp.Xml/XmlAttributeAttribute.cs src/Mono.Upnp/Mono.Upnp/Mono.Upnp.Xml/XmlAutomatable.cs src/Mono.Upnp/Mono.Upnp/Mono.Upnp.Xml/XmlDeserializable.cs src/Mono.Upnp/Mono.Upnp/Mono.Upnp.Xml/XmlDeserializationContext.cs src/Mono.Upnp/Mono.Upnp/Mono.Upnp.Xml/XmlDeserializer.cs src/Mono.Upnp/Mono.Upnp/Mono.Upnp.Xml/XmlElementAttribute.cs src/Mono.Upnp/Mono.Upnp/Mono.Upnp.Xml/XmlEnumAttribute.cs src/Mono.Upnp/Mono.Upnp/Mono.Upnp.Xml/XmlFlagAttribute.cs src/Mono.Upnp/Mono.Upnp/Mono.Upnp.Xml/XmlSerializable.cs src/Mono.Upnp/Mono.Upnp/Mono.Upnp.Xml/XmlSerializationContext.cs src/Mono.Upnp/Mono.Upnp/Mono.Upnp.Xml/XmlSerializer.cs src/Mono.Upnp/Mono.Upnp/Mono.Upnp.Xml/XmlTypeAttribute.cs src/Mono.Upnp/Mono.Upnp/Mono.Upnp.csproj src/Mono.Upnp/Mono.Upnp/Mono.Upnp/DeviceType.cs src/Mono.Upnp/Mono.Upnp/Mono.Upnp/ServiceType.cs src/Mono.Upnp/Mono.Upnp/Mono.Upnp/TypeInfo.cs src/Mono.Upnp/Mono.Upnp/Mono.Upnp/UpnpDeserializationException.cs src/Mono.Upnp/Mono.Upnp/Mono.Upnp/UpnpEventArgs.cs src/Mono.Upnp/Mono.Upnp/Mono.Upnp/UpnpException.cs
Showing diff toe69c92070d2