diff options
| author | Eike Ziller <[email protected]> | 2011-11-11 09:46:01 +0100 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2011-11-11 09:46:25 +0100 |
| commit | 85cf2b661e668d20a56f649b118d6bdc713477e4 (patch) | |
| tree | 4dfb59750827bb34ea566dae6c637a17577cf974 /src/plugins/macros/macromanager.cpp | |
| parent | 920ed1140edab10f8fa6d40974cd6ad4fed55c85 (diff) | |
| parent | d099d6856ee2b259923201b384ff58b75f2c358e (diff) | |
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
Diffstat (limited to 'src/plugins/macros/macromanager.cpp')
| -rw-r--r-- | src/plugins/macros/macromanager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/macros/macromanager.cpp b/src/plugins/macros/macromanager.cpp index a979594bbce..2c3ef74860a 100644 --- a/src/plugins/macros/macromanager.cpp +++ b/src/plugins/macros/macromanager.cpp @@ -4,7 +4,7 @@ ** ** Copyright (c) 2010 Nicolas Arnaud-Cormos. ** -** Contact: Nokia Corporation ([email protected]) +** Contact: Nokia Corporation ([email protected]) ** ** ** GNU Lesser General Public License Usage @@ -26,7 +26,7 @@ ** conditions contained in a signed written agreement between you and Nokia. ** ** If you have questions regarding the use of this file, please contact -** Nokia at [email protected]. +** Nokia at [email protected]. ** **************************************************************************/ |