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/declarative/minehunt | |
| 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/declarative/minehunt')
| -rw-r--r-- | demos/declarative/minehunt/MinehuntCore/Explosion.qml | 2 | ||||
| -rw-r--r-- | demos/declarative/minehunt/MinehuntCore/Tile.qml | 2 | ||||
| -rw-r--r-- | demos/declarative/minehunt/main.cpp | 2 | ||||
| -rw-r--r-- | demos/declarative/minehunt/minehunt.cpp | 2 | ||||
| -rw-r--r-- | demos/declarative/minehunt/minehunt.h | 2 | ||||
| -rw-r--r-- | demos/declarative/minehunt/minehunt.qml | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/demos/declarative/minehunt/MinehuntCore/Explosion.qml b/demos/declarative/minehunt/MinehuntCore/Explosion.qml index f04d03361b..33eabf033c 100644 --- a/demos/declarative/minehunt/MinehuntCore/Explosion.qml +++ b/demos/declarative/minehunt/MinehuntCore/Explosion.qml @@ -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/declarative/minehunt/MinehuntCore/Tile.qml b/demos/declarative/minehunt/MinehuntCore/Tile.qml index 1853ed9314..247be8c692 100644 --- a/demos/declarative/minehunt/MinehuntCore/Tile.qml +++ b/demos/declarative/minehunt/MinehuntCore/Tile.qml @@ -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/declarative/minehunt/main.cpp b/demos/declarative/minehunt/main.cpp index 2b286eff50..23b49d6f6b 100644 --- a/demos/declarative/minehunt/main.cpp +++ b/demos/declarative/minehunt/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/declarative/minehunt/minehunt.cpp b/demos/declarative/minehunt/minehunt.cpp index aaaaaac175..4da66acb8f 100644 --- a/demos/declarative/minehunt/minehunt.cpp +++ b/demos/declarative/minehunt/minehunt.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/declarative/minehunt/minehunt.h b/demos/declarative/minehunt/minehunt.h index 962cf3d871..a276b59dfd 100644 --- a/demos/declarative/minehunt/minehunt.h +++ b/demos/declarative/minehunt/minehunt.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/declarative/minehunt/minehunt.qml b/demos/declarative/minehunt/minehunt.qml index 88ecd6dbc9..026689b7ff 100644 --- a/demos/declarative/minehunt/minehunt.qml +++ b/demos/declarative/minehunt/minehunt.qml @@ -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) ** |