diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-22 18:40:13 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-22 18:40:13 +0100 |
| commit | c608ec825410a9287f544a2ae3ce8154424e767d (patch) | |
| tree | 39ee3d73d1e970bf808ecb9f1af8affc124199e1 /configure.bat | |
| parent | f5c6a5d06ba7b303f2999dd7a103c29282abfaa6 (diff) | |
| parent | 15a32435561a668e69764d12edfa2b5c564c6505 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/corelib/io/qsavefile_p.h
src/corelib/tools/qregularexpression.cpp
src/gui/util/qvalidator.cpp
src/gui/util/qvalidator.h
Change-Id: I58fdf0358bd86e2fad5d9ad0556f3d3f1f535825
Diffstat (limited to 'configure.bat')
| -rw-r--r-- | configure.bat | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.bat b/configure.bat index 86f4229cc9..bdc8ffd947 100644 --- a/configure.bat +++ b/configure.bat @@ -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 tools applications of the Qt Toolkit. |