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

Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/coreplugin/editormanager/editormanager.cpp
	src/plugins/projectexplorer/editorconfiguration.cpp
	src/plugins/projectexplorer/projectfilewizardextension.cpp
	src/plugins/qmakeandroidsupport/createandroidmanifestwizard.cpp

Change-Id: I8de0f6fcdd8d214fbc14e79f74cb0206e6e2c6c1

2014-08-15 16:14:34 +02:00

..

cplusplus

Incremented year in copyright info

2014-01-09 09:41:23 +01:00

debugger

Dumper: Fix typo and exception handling

2014-07-24 16:55:12 +02:00

designer

Fixes: Implement make install target, Step 1

2009-01-21 08:52:19 +01:00

generic-highlighter

CMakeEditor: updated cmake.xml highlighting file from upstream.

2014-08-12 12:14:51 +02:00

glsl

Incremented year in copyright info

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

qml

QmlDesigner.NodeInstances: improve mockup for Window

2014-08-11 13:53:25 +02:00

qml-type-descriptions

qmljs: update import completion list

2014-05-17 13:28:01 +02:00

qmldesigner

QmlDesigner: fix binding loops while resizing

2014-08-12 13:58:03 +02:00

qmlicons

PNG: Fix warning about sRGB information

2013-05-27 16:12:01 +02:00

schemes

Change the shortcut for ui form preview

2010-08-25 11:57:02 +02:00

scripts

consoleprocess: support Terminal.app on mac

2013-01-29 17:56:59 +01:00

snippets

Snippets: Allow lowercase/titlecase/uppercase modifiers for variables

2013-08-20 14:49:17 +02:00

styles

Add syntax highlight for primitive data types

2014-06-24 15:44:13 +02:00

templates

Merge remote-tracking branch 'origin/3.2'

2014-08-15 16:14:34 +02:00

translations

Update Japanese translation.

2014-08-13 11:26:18 +02:00

welcomescreen

Welcome Screen: Show clone Session also for the default session

2014-08-01 15:02:16 +02:00

static.pro

Add experimental clang code-model plug-in.

2013-12-20 17:05:09 +01:00