diff options
| author | axis <qt-info@nokia.com> | 2010-01-21 12:20:33 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-01-21 12:20:33 (GMT) |
| commit | 833bea1f71ed685e5f371d93f6f5c2da7be546e5 (patch) | |
| tree | 09e3f60311ebf8af123a9e61f27908dd87118109 /src/plugins/graphicssystems/trace | |
| parent | d609f7d1963e06d05fa6f7e4a098a304a177bc68 (diff) | |
| parent | d83e82e5c8a7fa0f6b1dcc4b1ab56f22afd942f6 (diff) | |
| download | Qt-833bea1f71ed685e5f371d93f6f5c2da7be546e5.zip Qt-833bea1f71ed685e5f371d93f6f5c2da7be546e5.tar.gz Qt-833bea1f71ed685e5f371d93f6f5c2da7be546e5.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public
Conflicts:
mkspecs/features/symbian/platform_paths.prf
Diffstat (limited to 'src/plugins/graphicssystems/trace')
| -rw-r--r-- | src/plugins/graphicssystems/trace/main.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/graphicssystems/trace/qgraphicssystem_trace.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/graphicssystems/trace/qgraphicssystem_trace_p.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/graphicssystems/trace/main.cpp b/src/plugins/graphicssystems/trace/main.cpp index ae1f3c5..5b01bc1 100644 --- a/src/plugins/graphicssystems/trace/main.cpp +++ b/src/plugins/graphicssystems/trace/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/plugins/graphicssystems/trace/qgraphicssystem_trace.cpp b/src/plugins/graphicssystems/trace/qgraphicssystem_trace.cpp index fb6f5ea..13044f4 100644 --- a/src/plugins/graphicssystems/trace/qgraphicssystem_trace.cpp +++ b/src/plugins/graphicssystems/trace/qgraphicssystem_trace.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/src/plugins/graphicssystems/trace/qgraphicssystem_trace_p.h b/src/plugins/graphicssystems/trace/qgraphicssystem_trace_p.h index 4493aa7..34802e3 100644 --- a/src/plugins/graphicssystems/trace/qgraphicssystem_trace_p.h +++ b/src/plugins/graphicssystems/trace/qgraphicssystem_trace_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** |