Files
mRemoteNG/mRemoteV1/UI/Controls/ConnectionTree
David Sparer 788f597a3f Merge branch 'master' into develop
# Conflicts:
#	CHANGELOG.TXT
#	mRemoteNGTests/Config/Serializers/XmlConnectionNodeSerializer27Tests.cs
#	mRemoteNGTests/Config/Serializers/XmlConnectionsDocumentCompilerTests.cs
#	mRemoteNGTests/Config/Serializers/XmlConnectionsDocumentEncryptorTests.cs
#	mRemoteNGTests/Config/Serializers/XmlConnectionsSerializerTests.cs
#	mRemoteV1/Config/Serializers/XmlConnectionNodeSerializer26.cs
#	mRemoteV1/Config/Serializers/XmlConnectionsDocumentCompiler.cs
#	mRemoteV1/Config/Serializers/XmlConnectionsSerializer.cs
#	mRemoteV1/Properties/AssemblyInfo.cs
2017-03-06 13:21:56 -07:00
..
2017-01-13 10:41:28 -07:00