David Sparer
|
49e5b71235
|
Merge branch 'master' into develop
# 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
|
2017-11-08 11:52:10 -06:00 |
|
David Sparer
|
88d735ed56
|
resolved bug that would sometimes disable connection tree hot keys
bug was introduced in #652. I made sure that the original issue is still resolved
|
2017-11-04 22:04:08 -05:00 |
|
David Sparer
|
32a1dd64ab
|
Merge branch 'master' into develop
# Conflicts:
# CHANGELOG.TXT
# CREDITS.TXT
# README.MD
# Tools/postbuild_installer.ps1
# Tools/set_LargeAddressAware.ps1
# mRemoteNGTests/mRemoteNGTests.csproj
# mRemoteNGTests/packages.config
# mRemoteV1/App/Logger.cs
# mRemoteV1/App/Runtime.cs
# mRemoteV1/App/Startup.cs
# mRemoteV1/Connection/DefaultConnectionInfo.cs
# mRemoteV1/Connection/Protocol/IntegratedProgram.cs
# mRemoteV1/Connection/Protocol/PuttyBase.cs
# mRemoteV1/Messages/MessageCollector.cs
# mRemoteV1/Properties/AssemblyInfo.cs
# mRemoteV1/Resources/Language/Language.Designer.cs
# mRemoteV1/Resources/PuTTYNG.exe
# mRemoteV1/Tools/ConnectionsTreeToMenuItemsConverter.cs
# mRemoteV1/Tools/ExternalToolArgumentParser.cs
# mRemoteV1/Tools/IeBrowserEmulation.cs
# mRemoteV1/Tools/NotificationAreaIcon.cs
# mRemoteV1/Tools/PortScanner.cs
# mRemoteV1/UI/Controls/ConnectionTree/ConnectionTree.cs
# mRemoteV1/UI/Controls/ConnectionTree/NameColumn.cs
# mRemoteV1/UI/Forms/OptionsPages/ConnectionsPage.cs
# mRemoteV1/UI/Forms/frmMain.cs
# mRemoteV1/UI/Window/AboutWindow.cs
# mRemoteV1/UI/Window/PortScanWindow.cs
|
2017-11-03 11:15:20 -05:00 |
|
David Sparer
|
2406a7be49
|
fixes #600
|
2017-10-28 15:12:30 -05:00 |
|
David Sparer
|
93b45fba84
|
fixed auto column sizing to also include a horizontal scroll bar. resolves #501
|
2017-05-06 22:40:35 -06:00 |
|
David Sparer
|
ce5d0cefe3
|
organized some files
|
2017-01-13 10:41:28 -07:00 |
|