David Sparer
|
1aca1b7ae8
|
Merge branch 'develop' into remove_statics
# Conflicts:
# mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDeserializerTests.cs
# mRemoteNGTests/mRemoteNGTests.csproj
# mRemoteV1/App/Runtime.cs
# mRemoteV1/Config/Connections/XmlConnectionsLoader.cs
# mRemoteV1/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDeserializer.cs
# mRemoteV1/Connection/ConnectionsService.cs
# mRemoteV1/UI/Forms/frmMain.cs
# mRemoteV1/UI/Menu/MainFileMenu.cs
# mRemoteV1/UI/Window/ConfigWindow.cs
# mRemoteV1/UI/Window/ConnectionTreeWindow.cs
# mRemoteV1/UI/Window/PortScanWindow.cs
|
2018-07-23 15:06:15 -05:00 |
|