Eike Ziller 7545ce072f Merge remote-tracking branch 'origin/2.7' ...

Conflicts:
	src/plugins/projectexplorer/devicesupport/devicemanager.cpp

Change-Id: I1d46128f530428315e7ab5d52c8115036371487f

2013-03-04 15:07:19 +01:00

..

analyzerbase

Merge remote-tracking branch 'origin/2.6'

2013-01-31 16:25:33 +01:00

android

Merge remote-tracking branch 'origin/2.7'

2013-03-04 15:07:19 +01:00

autotoolsprojectmanager

Qml Debugging: Default option for Qt Quick application

2013-02-20 21:03:23 +01:00

bazaar

Merge remote-tracking branch 'origin/2.6'

2013-01-31 16:25:33 +01:00

bineditor

Editors: Delete context menu if editor widget is deleted

2013-02-19 11:04:29 +01:00

bookmarks

Doc: adding notes to bookmarks.

2013-02-06 11:43:44 +01:00

classview

Reduce padding in often-used structs

2013-02-21 13:22:21 +01:00

clearcase

ClearCase: Support also ".view.dat" as repository root indicator

2013-02-07 09:21:16 +01:00

cmakeprojectmanager

CMake: Make the default kit as the current generator

2013-03-01 12:21:13 +01:00

coreplugin

Merge remote-tracking branch 'origin/2.7'

2013-03-04 15:07:19 +01:00

cpaster

fix codepaster frontend qbs file

2013-02-25 16:52:17 +01:00

cppeditor

C++: Let "Add Definition" quick fix work with free function declarations

2013-03-04 10:28:05 +01:00

cpptools

C++: Fix semantic highlighter and tests.

2013-03-04 13:16:50 +01:00

cvs

CVS: Add open text

2013-03-01 11:23:15 +01:00

debugger

Merge remote-tracking branch 'origin/2.7'

2013-03-04 15:07:19 +01:00

designer

Merge remote-tracking branch 'origin/2.6'

2013-01-31 16:25:33 +01:00

diffeditor

Standardize IEditor subclass names, don't capitalize namespaces

2013-02-22 11:39:22 +01:00

fakevim

FakeVim: Correctly parse delete key as user input

2013-02-28 16:04:53 +01:00

find

Reduce padding in often-used structs

2013-02-21 13:22:21 +01:00

genericprojectmanager

Generic Project: Fix relative paths outside of project directory

2013-03-01 13:30:54 +01:00

git

Merge remote-tracking branch 'origin/2.7'

2013-03-04 15:07:19 +01:00

glsleditor

Merge remote-tracking branch 'origin/2.6'

2013-01-31 16:25:33 +01:00

helloworld

Merge remote-tracking branch 'origin/2.6'

2013-01-31 16:25:33 +01:00

help

HTML fix

2013-02-12 13:48:41 +01:00

imageviewer

Merge remote-tracking branch 'origin/2.6'

2013-01-31 16:25:33 +01:00

locator

Locator settings: replicate tool tip also on spinbox

2013-02-26 16:09:22 +01:00

macros

Doc: replace deprecated QDoc commands

2013-02-06 09:44:18 +01:00

madde

madde.qbs: add Utils dependency

2013-02-13 15:31:20 +01:00

mercurial

Merge remote-tracking branch 'origin/2.6'

2013-01-31 16:25:33 +01:00

perforce

Merge remote-tracking branch 'origin/2.6'

2013-01-31 16:25:33 +01:00

projectexplorer

Merge remote-tracking branch 'origin/2.7'

2013-03-04 15:07:19 +01:00

pythoneditor

Added PythonEditor plugin

2013-02-07 10:17:09 +01:00

qbsprojectmanager

Add qbs submodule

2013-03-01 11:48:56 +01:00

qmldesigner

Merge remote-tracking branch 'origin/2.7'

2013-02-28 12:02:40 +01:00

qmljseditor

qmljs: add infrastructure handling qml dialects better

2013-02-21 17:22:16 +01:00

qmljstools

qmljs: add infrastructure handling qml dialects better

2013-02-21 17:22:16 +01:00

qmlprofiler

QmlJSTools: Clean up dependencies

2013-02-25 14:00:07 +01:00

qmlprojectmanager

QmlJSTools: Clean up dependencies

2013-02-25 14:00:07 +01:00

qnx

Merge remote-tracking branch 'origin/2.7'

2013-03-04 15:07:19 +01:00

qt4projectmanager

Merge remote-tracking branch 'origin/2.7'

2013-03-04 15:07:19 +01:00

qtsupport

Merge remote-tracking branch 'origin/2.7'

2013-03-04 15:07:19 +01:00

remotelinux

Merge remote-tracking branch 'origin/2.6'

2013-01-31 16:25:33 +01:00

resourceeditor

Cleanup preprocessor statements

2013-02-22 16:00:38 +01:00

subversion

Svn: refactor class SubversionSettings

2013-03-01 11:15:37 +01:00

tasklist

Merge remote-tracking branch 'origin/2.6'

2013-01-31 16:25:33 +01:00

texteditor

C++: Fix semantic highlighter and tests.

2013-03-04 13:16:50 +01:00

todo

Add resize feature for TODO output pane

2013-02-17 09:39:28 +01:00

updateinfo

QtcPlugin.qbs: make every plugin depend on ExtensionSystem

2013-02-13 15:29:01 +01:00

valgrind

Reduce padding in often-used structs

2013-02-21 13:22:21 +01:00

vcsbase

VCS: Allow unlimited timeout

2013-03-01 11:23:42 +01:00

welcome

Merge remote-tracking branch 'origin/2.6'

2013-01-31 16:25:33 +01:00

plugins.pro

Merge remote-tracking branch 'origin/2.7'

2013-03-04 15:07:19 +01:00

QtcPlugin.qbs

QtcPlugin.qbs: make every plugin depend on ExtensionSystem

2013-02-13 15:29:01 +01:00