diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-01-19 01:40:49 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2011-01-19 01:40:49 (GMT) |
| commit | ebd4bc73c46c2962742a682b6a391fb68c482aec (patch) | |
| tree | 3045a1af9e65ca6500437d4e90ccfd3637fb6976 /demos/declarative/calculator | |
| parent | 9c1e67d83f6175f339e6771be05ee60ba72426b3 (diff) | |
| parent | 5d9738ed88da269033333299c16558882d346514 (diff) | |
| download | Qt-ebd4bc73c46c2962742a682b6a391fb68c482aec.zip Qt-ebd4bc73c46c2962742a682b6a391fb68c482aec.tar.gz Qt-ebd4bc73c46c2962742a682b6a391fb68c482aec.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11
Diffstat (limited to 'demos/declarative/calculator')
| -rw-r--r-- | demos/declarative/calculator/Core/Button.qml | 2 | ||||
| -rw-r--r-- | demos/declarative/calculator/Core/Display.qml | 2 | ||||
| -rw-r--r-- | demos/declarative/calculator/calculator.qml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/demos/declarative/calculator/Core/Button.qml b/demos/declarative/calculator/Core/Button.qml index f37de48..997a169 100644 --- a/demos/declarative/calculator/Core/Button.qml +++ b/demos/declarative/calculator/Core/Button.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/calculator/Core/Display.qml b/demos/declarative/calculator/Core/Display.qml index f928d3a..c75bc24 100644 --- a/demos/declarative/calculator/Core/Display.qml +++ b/demos/declarative/calculator/Core/Display.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/calculator/calculator.qml b/demos/declarative/calculator/calculator.qml index b3e4f2f..441bfb9 100644 --- a/demos/declarative/calculator/calculator.qml +++ b/demos/declarative/calculator/calculator.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) ** |