Files
mRemoteNG/mRemoteNGTests/Connection
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
..