mirror of
https://github.com/mRemoteNG/mRemoteNG.git
synced 2026-02-17 22:11:48 +08:00
# Conflicts: # CHANGELOG.TXT # mRemoteNGTests/mRemoteNGTests.csproj # mRemoteV1/App/Startup.cs # mRemoteV1/Connection/Protocol/IntegratedProgram.cs # mRemoteV1/Properties/AssemblyInfo.cs # mRemoteV1/Resources/Language/Language.Designer.cs # mRemoteV1/Resources/Language/Language.resx # mRemoteV1/UI/Controls/ConnectionTree/ConnectionTree.cs # mRemoteV1/UI/Forms/frmMain.cs # mRemoteV1/UI/Window/ConnectionTreeWindow.cs