Commit Graph

4 Commits

Author SHA1 Message Date
Sean Kaim
e143c6b5b4 resharper code reformat (to allow standard code style going forward) 2019-02-15 16:47:56 -05:00
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
Sean Kaim
53c8b3b66d use statement bodys to allow building with VS2015 2017-04-12 13:40:36 -04:00
David Sparer
20d330f0f1 split up startup arg parsing to a new class and cleaned up the related code. added some debug msgs 2017-02-03 16:20:08 -07:00