diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-17 18:19:33 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-17 18:20:05 +0100 |
| commit | 9338d4bd44787d9de16b097e2059c63e6d26eacd (patch) | |
| tree | d3a8b5952bd2bf4d17fe4c5d93daac91fdfc03d2 /src/declarative/graphicsitems/qdeclarativepincharea_p_p.h | |
| parent | 3146dcbdc768c90a03b58eed3f42630604443093 (diff) | |
| parent | 0cd72c52ca5e5b21adbd47d0f551535e727b80ee (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I1175450886eca4dcaf7e81ae82fd112e541ad2f8
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativepincharea_p_p.h')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativepincharea_p_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativepincharea_p_p.h b/src/declarative/graphicsitems/qdeclarativepincharea_p_p.h index f985e2b6..33bdf00c 100644 --- a/src/declarative/graphicsitems/qdeclarativepincharea_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativepincharea_p_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 QtDeclarative module of the Qt Toolkit. |