Oswald Buddenhagen f013c41d05 Merge remote-tracking branch 'origin/3.1' ...

Conflicts:
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp

Change-Id: Icce6e8dd9b3afd9a0fe836e9babfb7a17cee9c4d

2014-03-27 18:20:00 +01:00

..

cplusplus

Incremented year in copyright info

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

debugger

Merge remote-tracking branch 'origin/3.1'

2014-03-27 18:20:00 +01:00

designer

…

generic-highlighter

Git: Provide a real highlighter for interactive rebase

2013-06-03 10:40:32 +02:00

glsl

Incremented year in copyright info

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

qml

QmlDesigner: Don't set anchors for the root item

2014-03-25 15:46:19 +01:00

qml-type-descriptions

qmljs: update QtQuick2 bundle

2013-11-27 23:42:28 +01:00

qmldesigner

QmlDesigner.PropertyEditor: Fix echo mode

2014-03-25 17:52:11 +01: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

DiffEditor: Fix name for style constant

2013-07-03 07:42:12 +02:00

templates

Qnx: Update bar-descriptor templates

2014-03-27 17:06:22 +01:00

translations

Update Polish translations

2014-03-21 12:04:15 +01:00

welcomescreen

WelcomePage: Fixing missing images and warnings

2014-03-26 14:10:53 +01:00

static.pro

Add experimental clang code-model plug-in.

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