summaryrefslogtreecommitdiffstats
path: root/src/gui/image/qimagewriter.cpp
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-01-22 18:40:13 +0100
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-01-22 18:40:13 +0100
commitc608ec825410a9287f544a2ae3ce8154424e767d (patch)
tree39ee3d73d1e970bf808ecb9f1af8affc124199e1 /src/gui/image/qimagewriter.cpp
parentf5c6a5d06ba7b303f2999dd7a103c29282abfaa6 (diff)
parent15a32435561a668e69764d12edfa2b5c564c6505 (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 'src/gui/image/qimagewriter.cpp')
-rw-r--r--src/gui/image/qimagewriter.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/image/qimagewriter.cpp b/src/gui/image/qimagewriter.cpp
index 6085a0e465..3270a5ca01 100644
--- a/src/gui/image/qimagewriter.cpp
+++ b/src/gui/image/qimagewriter.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 QtGui module of the Qt Toolkit.