Eike Ziller 914adeab82 Merge remote-tracking branch 'origin/3.2' ...

Conflicts:
	src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp
	src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp

Change-Id: I1627f6aa98a442413f8b08b579ecaf9647dc887b

2014-09-16 15:17:21 +02:00

..

errorhandling

Incremented year in copyright info

2014-01-08 08:29:47 +01:00

remoteprocess

Incremented year in copyright info

2014-01-08 08:29:47 +01:00

sftp

SSH: Adapt test to signal renaming.

2014-09-11 12:52:41 +02:00

sftpfsmodel

Remove Qt version checks.

2014-09-08 10:33:25 +02:00

shell

Incremented year in copyright info

2014-01-08 08:29:47 +01:00

tunnel

SSH: Fix tunnel test.

2014-09-11 13:19:56 +02:00

ssh.pri

make library and plugin dependencies declarative

2013-04-03 14:37:45 +02:00

ssh.pro

SSH: Implement tunneling.

2012-08-28 15:12:04 +02:00