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

Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/debugger/qml/scriptconsole.cpp
	src/plugins/git/gitplugin.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h

Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39

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

..

stopmonitoringhandler.cpp

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

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

stopmonitoringhandler.h

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

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

taskfile.cpp

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

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

taskfile.h

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

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

taskfilefactory.cpp

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

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

taskfilefactory.h

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

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

tasklist_export.h

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

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

TaskList.mimetypes.xml

TaskList: add *.tasks.txt to the globbing pattern

2011-03-04 16:04:05 +01:00

TaskList.pluginspec.in

"Build Issues" was renamed to "Issues"

2011-10-25 11:57:10 +02:00

tasklist.pro

centralize addition of pluginspecs to OTHER_FILES

2010-11-03 17:47:41 +01:00

tasklist.qrc

Add TaskList plugin

2010-08-26 14:01:40 +02:00

tasklistconstants.h

Merge remote-tracking branch 'origin/2.4'

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

tasklistplugin.cpp

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

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

tasklistplugin.h

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

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