David Sparer
|
4dea0d03ed
|
Merge branch 'develop' into remove_statics
# Conflicts:
# mRemoteNGTests/IntegrationTests/XmlSerializationLifeCycleTests.cs
# mRemoteV1/App/Windows.cs
# mRemoteV1/Config/Settings/SettingsLoader.cs
# mRemoteV1/Messages/WriterDecorators/MessageFocusDecorator.cs
# mRemoteV1/UI/Controls/ConnectionTree/ConnectionTree.cs
# mRemoteV1/UI/Forms/OptionsPages/ConnectionsPage.cs
# mRemoteV1/UI/Forms/OptionsPages/CredentialsPage.cs
# mRemoteV1/UI/Forms/OptionsPages/TabsPanelsPage.cs
# mRemoteV1/UI/Forms/OptionsPages/UpdatesPage.cs
# mRemoteV1/UI/Forms/frmChoosePanel.cs
# mRemoteV1/UI/Forms/frmMain.cs
# mRemoteV1/UI/Window/ConfigWindow.cs
# mRemoteV1/UI/Window/ConnectionTreeWindow.cs
# mRemoteV1/UI/Window/ErrorAndInfoWindow.cs
|
2018-08-24 18:14:54 -05:00 |
|