mirror of
https://github.com/mRemoteNG/mRemoteNG.git
synced 2026-02-17 22:11:48 +08:00
# Conflicts: # CHANGELOG.TXT # mRemoteV1/App/CompatibilityChecker.cs # mRemoteV1/App/Import.cs # mRemoteV1/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializer.cs # mRemoteV1/Properties/AssemblyInfo.cs # mRemoteV1/Properties/Settings.Designer.cs # mRemoteV1/Properties/Settings.settings # mRemoteV1/app.config # mRemoteV1/mRemoteV1.csproj