diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-17 18:24:47 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-17 18:24:47 +0100 |
| commit | d433198f60c30f0a2d8aae2dfb8fe2d04cc842a0 (patch) | |
| tree | f01009393fe34a9a7bd42785b4211ce67e2088a2 /src/svg/qsvggraphics_p.h | |
| parent | f88807e62f48c0e4f714a40d306e1ed0caaa932a (diff) | |
| parent | 8ce0f65e1abf3b0b9a1684dac3a32cd0b03ffc3c (diff) | |
| download | qtsvg-d433198f60c30f0a2d8aae2dfb8fe2d04cc842a0.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
sync.profile
Change-Id: Ibeaf4db17361deb890b154c637a62cfd06b76e26
Diffstat (limited to 'src/svg/qsvggraphics_p.h')
| -rw-r--r-- | src/svg/qsvggraphics_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/svg/qsvggraphics_p.h b/src/svg/qsvggraphics_p.h index 397c741..8118731 100644 --- a/src/svg/qsvggraphics_p.h +++ b/src/svg/qsvggraphics_p.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 QtSvg module of the Qt Toolkit. |