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

Conflicts:
	src/plugins/projectexplorer/projectexplorer.cpp

Change-Id: I6dffc1925e6bf35cf6e9fe0676c11d1a5143a208

2014-09-29 13:40:53 +02:00

..

shared

Squish: Update Creator's sources to v3.1.0

2014-05-26 13:17:05 +02:00

tst_basic_cpp_support

Squish: Use small letters in shortcuts

2014-08-18 15:20:27 +02:00

tst_delete_externally

Squish: Add test for external modification

2014-05-09 07:39:53 +02:00

tst_edit_externally

Squish: Continue testing other files after fatal error

2014-09-02 16:54:54 +02:00

tst_generic_highlighter

Squish: Update editor tests

2014-06-26 15:30:13 +02:00

tst_memberoperator

Squish: Run tst_memberoperator with Clang code model, too

2014-09-25 16:09:12 +02:00

tst_modify_readonly

Squish: Updates to keep suite_debugger running

2014-09-17 16:45:04 +02:00

tst_qml_editor

Squish: Configure old Qt Quick projects with Qt 4

2014-04-02 13:58:54 +02:00

tst_qml_indent

Squish: Use small letters in shortcuts

2014-08-18 15:20:27 +02:00

tst_rename_macros

Squish: Update objects moved from Find::Internal

2014-02-13 13:37:22 +01:00

tst_revert_changes

Squish: Updates to keep suite_debugger running

2014-09-17 16:45:04 +02:00

tst_select_all

Squish: Stabilize tst_select_all

2014-05-06 11:28:45 +02:00

envvars

Squish: Add missing envvars files

2013-12-12 13:05:13 +01:00

suite.conf

Squish: Add test for generic highlighter and MIME types

2014-06-02 14:49:32 +02:00