Oswald Buddenhagen 1fda2111d4 Merge remote-tracking branch 'origin/2.6' ...

Conflicts:
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
	src/plugins/qmldesigner/designercore/include/widgetqueryview.h
	src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qnx/bardescriptormagicmatcher.h
	src/plugins/qt4projectmanager/profilekeywords.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h

Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104

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

..

gerrit

Merge remote-tracking branch 'origin/2.6'

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

gitorious

Merge remote-tracking branch 'origin/2.6'

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

images

Add icons for checkout and clone wizards.

2010-05-19 18:40:45 +02:00

annotationhighlighter.cpp

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

annotationhighlighter.h

Merge remote-tracking branch 'origin/2.6'

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

branchadddialog.cpp

Merge remote-tracking branch 'origin/2.6'

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

branchadddialog.h

Merge remote-tracking branch 'origin/2.6'

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

branchadddialog.ui

Git: Rework branch dialog

2011-06-22 10:46:48 +02:00

branchcheckoutdialog.cpp

Git: Auto stash for branches

2013-01-07 15:33:20 +01:00

branchcheckoutdialog.h

Git: Auto stash for branches

2013-01-07 15:33:20 +01:00

branchcheckoutdialog.ui

Git: Auto stash for branches

2013-01-07 15:33:20 +01:00

branchdialog.cpp

Merge remote-tracking branch 'origin/2.6'

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

branchdialog.h

Merge remote-tracking branch 'origin/2.6'

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

branchdialog.ui

Git: Added Merge and Rebase

2013-01-07 15:26:47 +01:00

branchmodel.cpp

Merge remote-tracking branch 'origin/2.6'

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

branchmodel.h

Merge remote-tracking branch 'origin/2.6'

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

changeselectiondialog.cpp

Merge remote-tracking branch 'origin/2.6'

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

changeselectiondialog.h

Merge remote-tracking branch 'origin/2.6'

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

changeselectiondialog.ui

Git: Show change details in a text edit instead of a tooltip

2013-01-21 11:30:55 +01:00

clonewizard.cpp

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

clonewizard.h

Merge remote-tracking branch 'origin/2.6'

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

clonewizardpage.cpp

Merge remote-tracking branch 'origin/2.6'

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

clonewizardpage.h

Merge remote-tracking branch 'origin/2.6'

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

commitdata.cpp

Merge remote-tracking branch 'origin/2.6'

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

commitdata.h

Merge remote-tracking branch 'origin/2.6'

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

Git.pluginspec.in

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

git.pro

Generalize QT_NO_CAST_FROM_ASCII

2013-01-16 01:14:08 +01:00

git.qbs

Generalize QT_NO_CAST_FROM_ASCII

2013-01-16 01:14:08 +01:00

git.qrc

Add icons for checkout and clone wizards.

2010-05-19 18:40:45 +02:00

gitclient.cpp

Merge remote-tracking branch 'origin/2.6'

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

gitclient.h

Merge remote-tracking branch 'origin/2.6'

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

gitconstants.h

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

giteditor.cpp

Merge remote-tracking branch 'origin/2.6'

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

giteditor.h

Merge remote-tracking branch 'origin/2.6'

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

gitplugin.cpp

Merge remote-tracking branch 'origin/2.6'

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

gitplugin.h

Merge remote-tracking branch 'origin/2.6'

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

gitsettings.cpp

Merge remote-tracking branch 'origin/2.6'

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

gitsettings.h

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

gitsubmiteditor.cpp

Merge remote-tracking branch 'origin/2.6'

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

gitsubmiteditor.h

Merge remote-tracking branch 'origin/2.6'

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

gitsubmiteditorwidget.cpp

Merge remote-tracking branch 'origin/2.6'

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

gitsubmiteditorwidget.h

Merge remote-tracking branch 'origin/2.6'

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

gitsubmitpanel.ui

Git: Reorder fields in submit panel

2012-06-25 10:28:01 +02:00

gitutils.cpp

Merge remote-tracking branch 'origin/2.6'

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

gitutils.h

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

gitversioncontrol.cpp

Merge remote-tracking branch 'origin/2.6'

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

gitversioncontrol.h

Merge remote-tracking branch 'origin/2.6'

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

mergetool.cpp

Git: Added Revert and cherry-pick

2013-01-21 10:41:01 +01:00

mergetool.h

Git: Added Revert and cherry-pick

2013-01-21 10:41:01 +01:00

remoteadditiondialog.ui

Git: String updates

2011-05-13 14:56:31 +02:00

remotedialog.cpp

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

remotedialog.h

Merge remote-tracking branch 'origin/2.6'

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

remotedialog.ui

Git: Push to non-default remotes

2011-12-08 11:18:10 +01:00

remotemodel.cpp

Merge remote-tracking branch 'origin/2.6'

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

remotemodel.h

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

resetdialog.cpp

Merge remote-tracking branch 'origin/2.6'

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

resetdialog.h

Merge remote-tracking branch 'origin/2.6'

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

settingspage.cpp

Merge remote-tracking branch 'origin/2.6'

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

settingspage.h

Merge remote-tracking branch 'origin/2.6'

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

settingspage.ui

Reduce height of version control settings pages.

2012-12-17 16:56:36 +01:00

stashdialog.cpp

Merge remote-tracking branch 'origin/2.6'

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

stashdialog.h

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

stashdialog.ui

VCS[git]: Add support for stashes.

2010-01-15 12:28:22 +01:00

TODO.txt

Typos spotted while translating

2010-08-19 14:06:50 +02:00