Eike Ziller 8d894aee02 Merge remote-tracking branch 'origin/2.7' into 2.8 ...

Conflicts:
	src/plugins/analyzerbase/analyzerbase.qbs
	src/plugins/qmljseditor/qmljseditor.qbs
	src/plugins/qt4projectmanager/qt4projectmanager.qbs

Change-Id: If9db8894ed27401a9aa9b385a6117be4c38edd11

2013-05-28 18:28:00 +02:00

..

diffeditor_dependencies.pri

make library and plugin dependencies declarative

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

diffeditor_global.h

Experimental integration of DiffEditor

2013-02-18 18:15:51 +01:00

DiffEditor.pluginspec.in

Make DiffEditor non-experimental

2013-05-07 08:48:25 +02:00

diffeditor.pro

Basic integration of diff editor inside git plugin

2013-05-15 16:24:38 +02:00

diffeditor.qbs

Merge remote-tracking branch 'origin/2.7' into 2.8

2013-05-28 18:28:00 +02:00

diffeditorconstants.h

Rename namespace DIFFEditor to DiffEditor.

2013-02-21 17:13:06 +01:00

diffeditoreditable.cpp

Editors: Provide a base implementation for {save,restore}State

2013-05-27 14:40:42 +02:00

diffeditoreditable.h

Editors: Provide a base implementation for {save,restore}State

2013-05-27 14:40:42 +02:00

diffeditorfile.cpp

Basic integration of diff editor inside git plugin

2013-05-15 16:24:38 +02:00

diffeditorfile.h

Basic integration of diff editor inside git plugin

2013-05-15 16:24:38 +02:00

diffeditorplugin.cpp

Add file list combobox to diff editor

2013-05-24 14:14:06 +02:00

diffeditorplugin.h

Add file list combobox to diff editor

2013-05-24 14:14:06 +02:00

diffeditorwidget.cpp

Editors: Provide a base implementation for duplicate{,Supported}

2013-05-27 14:27:16 +02:00

diffeditorwidget.h

Add file list combobox to diff editor

2013-05-24 14:14:06 +02:00

differ.cpp

Merge remote-tracking branch 'origin/2.7'

2013-03-18 10:19:14 +01:00

differ.h

Add cleanupSemanticsLossless for even betten diff output

2013-03-15 14:32:58 +01:00