diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-17 14:14:58 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-17 18:14:06 +0100 |
commit | 9ccf743c4ee38f228abeebb5a7cd5f8618f9a602 (patch) | |
tree | b980374a9373d0b23bc40703683bff17676d5d27 /tests | |
parent | ba4f4d65b93e28ea0272cc1427c95dd2c9b6ed33 (diff) | |
parent | ce0de1819ac3aad1d7da9e7bcfd99331fcc23dd7 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I5973d2b84a0b2690b4b7f8dc37711c7dfd106180
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/v8/tst_v8.cpp | 2 | ||||
-rw-r--r-- | tests/auto/v8/v8main.cpp | 2 | ||||
-rw-r--r-- | tests/auto/v8/v8test.cpp | 2 | ||||
-rw-r--r-- | tests/auto/v8/v8test.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/v8/tst_v8.cpp b/tests/auto/v8/tst_v8.cpp index f13e8f5..7461ce3 100644 --- a/tests/auto/v8/tst_v8.cpp +++ b/tests/auto/v8/tst_v8.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the test suite of the Qt Toolkit. diff --git a/tests/auto/v8/v8main.cpp b/tests/auto/v8/v8main.cpp index fe75bd9..5ec41ad 100644 --- a/tests/auto/v8/v8main.cpp +++ b/tests/auto/v8/v8main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the test suite of the Qt Toolkit. diff --git a/tests/auto/v8/v8test.cpp b/tests/auto/v8/v8test.cpp index 4a1153a..6621846 100644 --- a/tests/auto/v8/v8test.cpp +++ b/tests/auto/v8/v8test.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the test suite of the Qt Toolkit. diff --git a/tests/auto/v8/v8test.h b/tests/auto/v8/v8test.h index 900d25f..2db655c 100644 --- a/tests/auto/v8/v8test.h +++ b/tests/auto/v8/v8test.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the test suite of the Qt Toolkit. |