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

Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/madde/maemopackagecreationstep.cpp
	src/plugins/projectexplorer/buildmanager.cpp
	src/plugins/qmljstools/qmljsqtstylecodeformatter.cpp
	src/plugins/qmljstools/qmljsqtstylecodeformatter.h
	tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp

Change-Id: I63ab2ba5dac006c37ccfbae55b023396a4676ff7

2011-11-01 18:16:38 +01:00

..

gitorious

Merge branch '2.3'

2011-07-25 13:57:13 +02:00

images

Add icons for checkout and clone wizards.

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

annotationhighlighter.cpp

Fix/add copyright headers

2011-05-06 15:17:05 +02:00

annotationhighlighter.h

Fix/add copyright headers

2011-05-06 15:17:05 +02:00

branchadddialog.cpp

Git: Fix addition of tracking branches

2011-07-26 14:42:15 +02:00

branchadddialog.h

Add copyright headers

2011-07-06 11:56:33 +02:00

branchadddialog.ui

Git: Rework branch dialog

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

branchdialog.cpp

Git: Fix assert

2011-07-26 14:40:37 +02:00

branchdialog.h

Git: Rework branch dialog

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

branchdialog.ui

Git: Rework branch dialog

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

branchmodel.cpp

Fix possible crash in git branch dialog

2011-08-15 15:01:13 +02:00

branchmodel.h

Git: Rework branch dialog

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

changeselectiondialog.cpp

Fix/add copyright headers

2011-05-06 15:17:05 +02:00

changeselectiondialog.h

Fix/add copyright headers

2011-05-06 15:17:05 +02:00

changeselectiondialog.ui

VCS[git]: Fix change dialog.

2010-11-15 12:07:10 +01:00

clonewizard.cpp

Fix/add copyright headers

2011-05-06 15:17:05 +02:00

clonewizard.h

Fix/add copyright headers

2011-05-06 15:17:05 +02:00

clonewizardpage.cpp

git: Reuse more code from vcsbase

2011-10-05 16:03:32 +02:00

clonewizardpage.h

Fix/add copyright headers

2011-05-06 15:17:05 +02:00

commitdata.cpp

Git: Do the right thing when commiting

2011-10-31 11:49:39 +01:00

commitdata.h

Git: Do the right thing when commiting

2011-10-31 11:49:39 +01:00

git.pro

Git: Remove GitCommand

2011-10-05 17:34:30 +02:00

git.qrc

Add icons for checkout and clone wizards.

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

gitclient.cpp

Git: Do the right thing when commiting

2011-10-31 11:49:39 +01:00

gitclient.h

Git: Do the right thing when commiting

2011-10-31 11:49:39 +01:00

gitconstants.h

git: Reuse more code from vcsbase

2011-10-05 16:03:32 +02:00

giteditor.cpp

git: Reuse more code from vcsbase

2011-10-05 16:03:32 +02:00

giteditor.h

Fix/add copyright headers

2011-05-06 15:17:05 +02:00

gitplugin.cpp

Git: Do the right thing when commiting

2011-10-31 11:49:39 +01:00

gitplugin.h

Git: Do the right thing when commiting

2011-10-31 11:49:39 +01:00

gitsettings.cpp

Git: Fix git.cmd not found on windows

2011-10-06 12:05:24 +02:00

gitsettings.h

git: Reuse more code from vcsbase

2011-10-05 16:03:32 +02:00

gitsubmiteditor.cpp

Git: Do the right thing when commiting

2011-10-31 11:49:39 +01:00

gitsubmiteditor.h

Small coding style cleanup

2011-10-21 11:44:36 +02:00

gitsubmiteditorwidget.cpp

Fix/add copyright headers

2011-05-06 15:17:05 +02:00

gitsubmiteditorwidget.h

Fix/add copyright headers

2011-05-06 15:17:05 +02:00

gitsubmitpanel.ui

Git: Only allow commit if author information is valid

2010-10-04 15:49:22 +02:00

gitutils.cpp

Fix/add copyright headers

2011-05-06 15:17:05 +02:00

gitutils.h

Fix/add copyright headers

2011-05-06 15:17:05 +02:00

gitversioncontrol.cpp

git: Reuse more code from vcsbase

2011-10-05 16:03:32 +02:00

gitversioncontrol.h

Fix/add copyright headers

2011-05-06 15:17:05 +02:00

remoteadditiondialog.ui

Git: String updates

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

remotedialog.cpp

Fix memory leaks (lacking destructors for uis)

2011-10-28 17:49:33 +02:00

remotedialog.h

Fix memory leaks (lacking destructors for uis)

2011-10-28 17:49:33 +02:00

remotedialog.ui

Git: Shrink down remote dialog

2011-06-07 16:22:28 +02:00

remotemodel.cpp

Git: remote dialog improvements

2011-06-07 11:35:07 +02:00

remotemodel.h

Git: remote dialog improvements

2011-06-07 11:35:07 +02:00

ScmGit.pluginspec.in

It's 2011 now.

2011-01-12 09:46:24 +01:00

settingspage.cpp

Fix build on windows

2011-10-05 16:54:26 +02:00

settingspage.h

Use classes in favor of structs

2011-08-02 15:56:55 +02:00

settingspage.ui

Git: Update settigspage

2011-10-18 13:32:09 +02:00

stashdialog.cpp

Fix/add copyright headers

2011-05-06 15:17:05 +02:00

stashdialog.h

Fix/add copyright headers

2011-05-06 15:17:05 +02: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