diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-25 11:58:59 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-25 11:59:44 +0100 |
| commit | 27cbc14bad01ce78458e3bd42ec8fb6e63e9a48f (patch) | |
| tree | c7f7fe88146b44008a6477925402350cfc20fca0 /src/activeqt/control/qaxmain.cpp | |
| parent | c4ca96871280f9dd896d62fe5ea3e01b79b106e6 (diff) | |
| parent | 7f394bc7c4c61289885101f4d349a0bf573ac11d (diff) | |
| download | qtactiveqt-27cbc14bad01ce78458e3bd42ec8fb6e63e9a48f.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I68995b86daa2caaa1806107631edaeb2d8dc66c3
Diffstat (limited to 'src/activeqt/control/qaxmain.cpp')
| -rw-r--r-- | src/activeqt/control/qaxmain.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/activeqt/control/qaxmain.cpp b/src/activeqt/control/qaxmain.cpp index 0c6a70b..dcd38e4 100644 --- a/src/activeqt/control/qaxmain.cpp +++ b/src/activeqt/control/qaxmain.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 ActiveQt framework of the Qt Toolkit. |