diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-01-19 11:40:49 +1000 |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2011-01-19 11:40:49 +1000 |
| commit | ebd4bc73c46c2962742a682b6a391fb68c482aec (patch) | |
| tree | 3045a1af9e65ca6500437d4e90ccfd3637fb6976 /demos/chip | |
| parent | 9c1e67d83f6175f339e6771be05ee60ba72426b3 (diff) | |
| parent | 5d9738ed88da269033333299c16558882d346514 (diff) | |
| download | qt4-tools-ebd4bc73c46c2962742a682b6a391fb68c482aec.tar.gz | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11
Diffstat (limited to 'demos/chip')
| -rw-r--r-- | demos/chip/chip.cpp | 2 | ||||
| -rw-r--r-- | demos/chip/chip.h | 2 | ||||
| -rw-r--r-- | demos/chip/main.cpp | 2 | ||||
| -rw-r--r-- | demos/chip/mainwindow.cpp | 2 | ||||
| -rw-r--r-- | demos/chip/mainwindow.h | 2 | ||||
| -rw-r--r-- | demos/chip/view.cpp | 2 | ||||
| -rw-r--r-- | demos/chip/view.h | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/demos/chip/chip.cpp b/demos/chip/chip.cpp index 54781425c2..6f3b529f16 100644 --- a/demos/chip/chip.cpp +++ b/demos/chip/chip.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/demos/chip/chip.h b/demos/chip/chip.h index a34efe86c6..dca63b71fc 100644 --- a/demos/chip/chip.h +++ b/demos/chip/chip.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/demos/chip/main.cpp b/demos/chip/main.cpp index 2307542014..a4353bfde4 100644 --- a/demos/chip/main.cpp +++ b/demos/chip/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/demos/chip/mainwindow.cpp b/demos/chip/mainwindow.cpp index db56c590d8..825c38823a 100644 --- a/demos/chip/mainwindow.cpp +++ b/demos/chip/mainwindow.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/demos/chip/mainwindow.h b/demos/chip/mainwindow.h index 2983d59da4..9c8ac03638 100644 --- a/demos/chip/mainwindow.h +++ b/demos/chip/mainwindow.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/demos/chip/view.cpp b/demos/chip/view.cpp index 7af30740a6..a80bf82a10 100644 --- a/demos/chip/view.cpp +++ b/demos/chip/view.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/demos/chip/view.h b/demos/chip/view.h index 8047b8b5a4..fc819dff41 100644 --- a/demos/chip/view.h +++ b/demos/chip/view.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** |