con 38f6379f39 Merge remote branch 'origin/2.0' ...

Conflicts:
	doc/qtcreator.qdoc
	src/plugins/find/currentdocumentfind.cpp
	src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp

2010-05-17 17:40:40 +02:00

..

annotationhighlighter.cpp

Long live the king!

2010-03-05 11:28:13 +01:00

annotationhighlighter.h

Long live the king!

2010-03-05 11:28:13 +01:00

checkoutwizard.cpp

Fix clone wizard texts.

2010-05-17 13:01:45 +02:00

checkoutwizard.h

Long live the king!

2010-03-05 11:28:13 +01:00

checkoutwizardpage.cpp

Replace QWizard with Utils::Wizard

2010-03-31 15:22:14 +02:00

checkoutwizardpage.h

Long live the king!

2010-03-05 11:28:13 +01:00

CVS.mimetypes.xml

Add a CVS plugin for use with UNIX cvs or Tortoise CVS.

2009-07-15 12:28:40 +02:00

CVS.pluginspec

Version bump.

2010-04-30 11:58:05 +02:00

cvs.pro

Version control: Replace per-VCS output panes with a single one.

2009-08-10 15:46:45 +02:00

cvs.qrc

Add a CVS plugin for use with UNIX cvs or Tortoise CVS.

2009-07-15 12:28:40 +02:00

cvsconstants.h

Long live the king!

2010-03-05 11:28:13 +01:00

cvscontrol.cpp

Fix warning about unused parameters

2010-05-17 13:12:19 +02:00

cvscontrol.h

File renaming

2010-05-12 14:14:44 +02:00

cvseditor.cpp

Long live the king!

2010-03-05 11:28:13 +01:00

cvseditor.h

Long live the king!

2010-03-05 11:28:13 +01:00

cvsplugin.cpp

VCS: Initially enable menus.

2010-04-26 09:12:58 +02:00

cvsplugin.h

VCS: Initially enable menus.

2010-04-26 09:12:58 +02:00

cvssettings.cpp

Renamed VCSBaseSettingsPage to CommonSettingsPage

2010-04-12 18:54:05 +02:00

cvssettings.h

Long live the king!

2010-03-05 11:28:13 +01:00

cvssubmiteditor.cpp

Long live the king!

2010-03-05 11:28:13 +01:00

cvssubmiteditor.h

Long live the king!

2010-03-05 11:28:13 +01:00

cvsutils.cpp

Long live the king!

2010-03-05 11:28:13 +01:00

cvsutils.h

Long live the king!

2010-03-05 11:28:13 +01:00

settingspage.cpp

Create a single parent options page for the Version Control category

2010-04-12 18:54:05 +02:00

settingspage.h

Create a single parent options page for the Version Control category

2010-04-12 18:54:05 +02:00

settingspage.ui

Doc - UI - Fix UI text capitalization to follow the KDE Style Guide rules.

2010-05-14 15:53:56 +02:00