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 |
|
Christian Kandeler
|
24e81241a5
|
Remove duplicate module dependencies from qbs files.
These cause a warning now.
Change-Id: I4c4e9c3e11e7f97e66a4bcdd708489fafc8f0606
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
2013-05-27 17:59:12 +02:00 |
|
jkobus
|
97a86c50dc
|
Basic integration of diff editor inside git plugin
Change-Id: I7675fc1d994020f94f42f6bd7b4f75aa29e6edf6
Reviewed-by: David Schulz <david.schulz@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
|
2013-05-15 16:24:38 +02:00 |
|
jkobus
|
0e91d10878
|
Experimental integration of DiffEditor
After enabling the plugin go to Tools|Diff...
Change-Id: I793b6faedb93f58039df0a62e82fe04a017978ee
Reviewed-by: hjk <hjk121@nokiamail.com>
|
2013-02-18 18:15:51 +01:00 |
|