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

Conflicts:
	README
	tests/auto/debugger/tst_dumpers.cpp

Change-Id: Ib9aef37a246bc3bb9bca0c32a902af3b09ef3146

2014-03-11 13:39:55 +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-11 13:39:55 +01:00

designer

Fixes: Implement make install target, Step 1

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

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

Merge remote-tracking branch 'origin/3.0'

2014-02-11 09:14:22 +01:00

qml-type-descriptions

qmljs: update QtQuick2 bundle

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

qmldesigner

QmlDesigner.PropertyEditor: Remove duplicate

2014-03-06 15:07:29 +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

Change the priority for qml wizard templates

2014-03-06 18:58:13 +01:00

translations

Fix in French translation

2014-02-14 12:13:44 +01:00

welcomescreen

Welcome: updated links on Tutorials page to DDays13 videos

2014-03-03 16:14:55 +01:00

static.pro

Add experimental clang code-model plug-in.

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