diff options
| author | Martin Smith <martin.smith@nokia.com> | 2011-02-24 10:48:32 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2011-02-24 10:48:32 (GMT) |
| commit | e51fda7db531628b54297ae020dda4a5f962d394 (patch) | |
| tree | 846fa261f80459529235e890ed897cf6186e9351 /examples/uitools | |
| parent | 66aba9ad196c24d6844e39901bf152d0951ccfb7 (diff) | |
| parent | c881e33e7e510204fabd061dac08a00b10b432fb (diff) | |
| download | Qt-e51fda7db531628b54297ae020dda4a5f962d394.zip Qt-e51fda7db531628b54297ae020dda4a5f962d394.tar.gz Qt-e51fda7db531628b54297ae020dda4a5f962d394.tar.bz2 | |
Merge branch 'mimir' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into mimir
Diffstat (limited to 'examples/uitools')
| -rw-r--r-- | examples/uitools/multipleinheritance/calculatorform.cpp | 2 | ||||
| -rw-r--r-- | examples/uitools/multipleinheritance/calculatorform.h | 2 | ||||
| -rw-r--r-- | examples/uitools/multipleinheritance/main.cpp | 2 | ||||
| -rw-r--r-- | examples/uitools/textfinder/main.cpp | 2 | ||||
| -rw-r--r-- | examples/uitools/textfinder/textfinder.cpp | 2 | ||||
| -rw-r--r-- | examples/uitools/textfinder/textfinder.h | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/examples/uitools/multipleinheritance/calculatorform.cpp b/examples/uitools/multipleinheritance/calculatorform.cpp index c9f3a6d..2963db3 100644 --- a/examples/uitools/multipleinheritance/calculatorform.cpp +++ b/examples/uitools/multipleinheritance/calculatorform.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/examples/uitools/multipleinheritance/calculatorform.h b/examples/uitools/multipleinheritance/calculatorform.h index 369f875..9b8c888 100644 --- a/examples/uitools/multipleinheritance/calculatorform.h +++ b/examples/uitools/multipleinheritance/calculatorform.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/examples/uitools/multipleinheritance/main.cpp b/examples/uitools/multipleinheritance/main.cpp index e60025d..f61c92c 100644 --- a/examples/uitools/multipleinheritance/main.cpp +++ b/examples/uitools/multipleinheritance/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/examples/uitools/textfinder/main.cpp b/examples/uitools/textfinder/main.cpp index 618c97d..2fe9b71 100644 --- a/examples/uitools/textfinder/main.cpp +++ b/examples/uitools/textfinder/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/examples/uitools/textfinder/textfinder.cpp b/examples/uitools/textfinder/textfinder.cpp index 4bb6600..660ef41 100644 --- a/examples/uitools/textfinder/textfinder.cpp +++ b/examples/uitools/textfinder/textfinder.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/examples/uitools/textfinder/textfinder.h b/examples/uitools/textfinder/textfinder.h index 7a49bf8..c3cd030 100644 --- a/examples/uitools/textfinder/textfinder.h +++ b/examples/uitools/textfinder/textfinder.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) ** |