David Sparer 995daecaff Merge branch 'MR-385_inheritance_settings_lost' into csharp_conv ...

# Conflicts:
#	mRemoteV1/App/Runtime.cs
#	mRemoteV1/Container/ContainerInfo.cs

2016-05-07 21:43:34 -06:00

..

App

re-adding some files lost during the migraton from sparerd/mRemoteNG-1

2016-04-14 01:27:15 -06:00

Config/Connections

Merge branch 'MR-385_inheritance_settings_lost' into csharp_conv

2016-05-07 21:43:34 -06:00

Connection

fixed issue described in MR-385

2016-05-07 17:59:23 -06:00

nUnitForms

re-adding some files lost during the migraton from sparerd/mRemoteNG-1

2016-04-14 01:27:15 -06:00

Properties

re-adding some files lost during the migraton from sparerd/mRemoteNG-1

2016-04-14 01:27:15 -06:00

UI

fix complier warning

2016-05-06 21:58:29 -04:00

ListViewTester.cs

re-adding some files lost during the migraton from sparerd/mRemoteNG-1

2016-04-14 01:27:15 -06:00

mRemoteNGTests.csproj

Merge branch 'MR-385_inheritance_settings_lost' into csharp_conv

2016-05-07 21:43:34 -06:00

packages.config

re-adding some files lost during the migraton from sparerd/mRemoteNG-1

2016-04-14 01:27:15 -06:00