Commit Graph

6 Commits

Author SHA1 Message Date
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
Sean Kaim
61865050c7 minor code cleanup 2017-09-15 15:34:54 -04:00
Pedro Rodrigues
926dc868ef Changed quick connect connection icon image to play icon when there are open connections 2017-09-10 22:42:29 +01:00
Julien Roncaglia
24b5dd0c8c Add server icons in the treeview 2017-06-13 10:26:24 +02:00
Sean Kaim
e824886e19 remove redundant argument values
and other minor resharper cleanup
2017-03-03 16:54:02 -05:00
David Sparer
eaced33ed5 Refactored some code for creating a menu tree of the connectiontreemodel 2016-09-26 14:07:33 -06:00