David Sparer 7a54b98ea2 Merge branch 'develop' into remove_statics ...

# Conflicts:
#	mRemoteV1/UI/Controls/MultiSshToolStrip.cs
#	mRemoteV1/UI/Forms/frmMain.cs
#	mRemoteV1/UI/Panels/PanelAdder.cs
#	mRemoteV1/UI/Window/ConnectionTreeWindow.cs

2018-10-25 10:02:32 -05:00

..

Protocol

Merge branch 'develop' into remove_statics

2018-10-25 10:02:32 -05:00

AbstractConnectionRecord.cs

Merge branch 'develop' into develop

2018-09-24 11:39:32 +02:00

ConnectionIcon.cs

Last VB references removed

2016-06-02 15:45:47 -04:00

ConnectionInfo.cs

Merge branch 'develop' into develop

2018-09-24 11:39:32 +02:00

ConnectionInfoComparer.cs

Sorting nodes now works (ascending/descending)

2016-09-15 12:05:46 -06:00

ConnectionInfoInheritance.cs

Fixed multiple errors in implementation

2018-04-15 20:13:28 +02:00

ConnectionInitiator.cs

Merge branch 'develop' into remove_statics

2018-08-24 18:14:54 -05:00

ConnectionsService.cs

Merge branch 'develop' into remove_statics

2018-08-24 18:14:54 -05:00

Converter.cs

code clean up / fix complier warning

2016-10-18 17:31:09 -04:00

DefaultConnectionInfo.cs

fix #1092

2018-08-28 09:35:08 -04:00

DefaultConnectionInheritance.cs

code clean up / null checks & logging

2017-09-15 13:58:32 -04:00

IConnectionInitiator.cs

made the rest of the connectioninitiator functions non-static

2017-01-12 13:57:15 -07:00

IConnectionsService.cs

fixed a few missed merge items

2018-07-23 15:19:29 -05:00

IHasParent.cs

Modified the IHasParent interface to include another common method

2016-09-08 09:10:52 -06:00

IInheritable.cs

Rename interface "Inheritance" to "IInheritable"

2016-08-10 09:24:48 -06:00

InterfaceControl.cs

fix virtual call in constructor

2017-09-05 11:06:12 -04:00

InterfaceControl.Designer.cs

fix virtual call in constructor

2017-09-05 11:06:12 -04:00

PuttySessionInfo.cs

"return ;" annoyed me...

2017-01-11 16:56:14 -05:00

WebHelper.cs

Merge branch 'develop' into remove_statics

2018-08-24 18:14:54 -05:00