Eike Ziller fbd47e25ee Merge remote-tracking branch 'origin/2.4' ...

Conflicts:
	qtcreator.pri
	share/qtcreator/templates/qtquickapp/main.cpp
	src/plugins/analyzerbase/analyzermanager.cpp
	src/plugins/qmlprofiler/qmlprofilertool.cpp

Change-Id: I3be78f22e7301d61a9c7fc142cbc34a3cebc2cf4

2011-11-18 10:16:49 +01:00

..

images

Added new Bazaar plugin

2011-02-28 16:08:38 +01:00

annotationhighlighter.cpp

all: s/info@qt.nokia.com/qt-info@nokia.com/

2011-11-03 10:33:19 +01:00

annotationhighlighter.h

Bazaar: whitespace and indentation fixes

2011-11-14 10:29:35 +01:00

bazaar_dependencies.pri

Added new Bazaar plugin

2011-02-28 16:08:38 +01:00

Bazaar.pluginspec.in

Added new Bazaar plugin

2011-02-28 16:08:38 +01:00

bazaar.pro

Added new Bazaar plugin

2011-02-28 16:08:38 +01:00

bazaar.qrc

Added new Bazaar plugin

2011-02-28 16:08:38 +01:00

bazaarclient.cpp

Bazaar: whitespace and indentation fixes

2011-11-14 10:29:35 +01:00

bazaarclient.h

Bazaar: whitespace and indentation fixes

2011-11-14 10:29:35 +01:00

bazaarcommitpanel.ui

UI text: check capitalization and tooltips

2011-06-22 10:05:33 +02:00

bazaarcommitwidget.cpp

all: s/info@qt.nokia.com/qt-info@nokia.com/

2011-11-03 10:33:19 +01:00

bazaarcommitwidget.h

all: s/info@qt.nokia.com/qt-info@nokia.com/

2011-11-03 10:33:19 +01:00

bazaarcontrol.cpp

Bazaar: whitespace and indentation fixes

2011-11-14 10:29:35 +01:00

bazaarcontrol.h

Bazaar: whitespace and indentation fixes

2011-11-14 10:29:35 +01:00

bazaareditor.cpp

Merge remote-tracking branch 'origin/2.4'

2011-11-18 10:16:49 +01:00

bazaareditor.h

all: s/info@qt.nokia.com/qt-info@nokia.com/

2011-11-03 10:33:19 +01:00

bazaarplugin.cpp

Bazaar: whitespace and indentation fixes

2011-11-14 10:29:35 +01:00

bazaarplugin.h

Bazaar: remove needless "virtual" in BazaarPlugin

2011-11-14 10:30:04 +01:00

bazaarsettings.cpp

Bazaar: whitespace and indentation fixes

2011-11-14 10:29:35 +01:00

bazaarsettings.h

all: s/info@qt.nokia.com/qt-info@nokia.com/

2011-11-03 10:33:19 +01:00

branchinfo.cpp

Bazaar: whitespace and indentation fixes

2011-11-14 10:29:35 +01:00

branchinfo.h

all: s/info@qt.nokia.com/qt-info@nokia.com/

2011-11-03 10:33:19 +01:00

cloneoptionspanel.cpp

Bazaar: whitespace and indentation fixes

2011-11-14 10:29:35 +01:00

cloneoptionspanel.h

all: s/info@qt.nokia.com/qt-info@nokia.com/

2011-11-03 10:33:19 +01:00

cloneoptionspanel.ui

UI text: check capitalization and tooltips

2011-06-22 10:05:33 +02:00

clonewizard.cpp

Bazaar: whitespace and indentation fixes

2011-11-14 10:29:35 +01:00

clonewizard.h

Bazaar: whitespace and indentation fixes

2011-11-14 10:29:35 +01:00

clonewizardpage.cpp

all: s/info@qt.nokia.com/qt-info@nokia.com/

2011-11-03 10:33:19 +01:00

clonewizardpage.h

Bazaar: whitespace and indentation fixes

2011-11-14 10:29:35 +01:00

commiteditor.cpp

Bazaar: whitespace and indentation fixes

2011-11-14 10:29:35 +01:00

commiteditor.h

Bazaar: whitespace and indentation fixes

2011-11-14 10:29:35 +01:00

constants.h

Merge remote-tracking branch 'origin/2.4'

2011-11-11 09:46:25 +01:00

optionspage.cpp

Bazaar: whitespace and indentation fixes

2011-11-14 10:29:35 +01:00

optionspage.h

all: s/info@qt.nokia.com/qt-info@nokia.com/

2011-11-03 10:33:19 +01:00

optionspage.ui

VCS: Unify VCS options pages a bit

2011-10-05 16:01:02 +02:00

pullorpushdialog.cpp

Bazaar: whitespace and indentation fixes

2011-11-14 10:29:35 +01:00

pullorpushdialog.h

Bazaar: whitespace and indentation fixes

2011-11-14 10:29:35 +01:00

pullorpushdialog.ui

UI text: check capitalization and tooltips

2011-06-22 10:05:33 +02:00

revertdialog.ui

Added new Bazaar plugin

2011-02-28 16:08:38 +01:00