rmcardle 82d56f13fc Merge branch 'master' into develop ...

Conflicts:
	CHANGELOG.TXT
	Installer/mRemote.nsi
	mRemoteV1/App/App.Runtime.vb
	mRemoteV1/Config/Config.Connections.Load.vb
	mRemoteV1/My Project/Resources.Designer.vb
	mRemoteV1/My Project/Settings.Designer.vb

2011-12-28 19:59:06 -06:00

..

Connection.Icon.vb

Code cleanup.

2011-06-05 01:54:47 -05:00

Connection.Info.vb

Renamed translation files from Resources.xx.resx to Language.xx.resx. Refactored string resources from My.Resources to My.Language. Moved neutral (en) string resources to Language.resx.

2011-06-12 12:39:55 -05:00

Connection.InterfaceControl.Designer.vb

Original mRemote 1.50 source as received from Felix Deimel.

2010-01-06 10:02:03 -06:00

Connection.InterfaceControl.vb

Code cleanup.

2011-06-05 01:54:47 -05:00

Connection.List.vb

Refactoring and even more translations

2010-08-01 01:12:36 +08:00

Connection.Protocol.Base.vb

Code cleanup.

2011-06-05 01:54:47 -05:00

Connection.Protocol.HTTP.vb

Refactoring and even more translations

2010-08-01 01:12:36 +08:00

Connection.Protocol.HTTPBase.vb

Renamed translation files from Resources.xx.resx to Language.xx.resx. Refactored string resources from My.Resources to My.Language. Moved neutral (en) string resources to Language.resx.

2011-06-12 12:39:55 -05:00

Connection.Protocol.HTTPS.vb

Code cleanup.

2011-06-04 21:31:14 -05:00

Connection.Protocol.ICA.vb

Renamed translation files from Resources.xx.resx to Language.xx.resx. Refactored string resources from My.Resources to My.Language. Moved neutral (en) string resources to Language.resx.

2011-06-12 12:39:55 -05:00

Connection.Protocol.IntApp.vb

Renamed translation files from Resources.xx.resx to Language.xx.resx. Refactored string resources from My.Resources to My.Language. Moved neutral (en) string resources to Language.resx.

2011-06-12 12:39:55 -05:00

Connection.Protocol.List.vb

Original mRemote 1.50 source as received from Felix Deimel.

2010-01-06 10:02:03 -06:00

Connection.Protocol.Protocols.vb

Bugfix: RDP protocol string missing

2011-03-31 19:45:56 -05:00

Connection.Protocol.PuttyBase.vb

Renamed translation files from Resources.xx.resx to Language.xx.resx. Refactored string resources from My.Resources to My.Language. Moved neutral (en) string resources to Language.resx.

2011-06-12 12:39:55 -05:00

Connection.Protocol.RAW.vb

Original mRemote 1.50 source as received from Felix Deimel.

2010-01-06 10:02:03 -06:00

Connection.Protocol.RDP.vb

Merge branch 'master' into develop

2011-12-28 19:59:06 -06:00

Connection.Protocol.Rlogin.vb

Original mRemote 1.50 source as received from Felix Deimel.

2010-01-06 10:02:03 -06:00

Connection.Protocol.Serial.vb

Original mRemote 1.50 source as received from Felix Deimel.

2010-01-06 10:02:03 -06:00

Connection.Protocol.SSH1.vb

Original mRemote 1.50 source as received from Felix Deimel.

2010-01-06 10:02:03 -06:00

Connection.Protocol.SSH2.vb

Original mRemote 1.50 source as received from Felix Deimel.

2010-01-06 10:02:03 -06:00

Connection.Protocol.Telnet.vb

Original mRemote 1.50 source as received from Felix Deimel.

2010-01-06 10:02:03 -06:00

Connection.Protocol.VNC.vb

Renamed translation files from Resources.xx.resx to Language.xx.resx. Refactored string resources from My.Resources to My.Language. Moved neutral (en) string resources to Language.resx.

2011-06-12 12:39:55 -05:00

Connection.PuttySession.vb

Original mRemote 1.50 source as received from Felix Deimel.

2010-01-06 10:02:03 -06:00

Connection.QuickConnect.vb

Renamed translation files from Resources.xx.resx to Language.xx.resx. Refactored string resources from My.Resources to My.Language. Moved neutral (en) string resources to Language.resx.

2011-06-12 12:39:55 -05:00