diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-17 18:25:39 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-17 18:25:39 +0100 |
| commit | 6863ce4e3582745ad683df646746fe23a8e21592 (patch) | |
| tree | 8bae39f23dddd59a80d9942a45d60ccf414f7810 /src/designer/src/components/formeditor/default_layoutdecoration.h | |
| parent | b18f31c9aebd273fd58646dc484d44b91662fa7a (diff) | |
| parent | 9b0b4e799aadde36521acff0dc3439b4eae51877 (diff) | |
| download | qttools-6863ce4e3582745ad683df646746fe23a8e21592.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
sync.profile
Change-Id: I9871b004cc76d14d34f4a904cd7a8e4f8e2bb91a
Diffstat (limited to 'src/designer/src/components/formeditor/default_layoutdecoration.h')
| -rw-r--r-- | src/designer/src/components/formeditor/default_layoutdecoration.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/designer/src/components/formeditor/default_layoutdecoration.h b/src/designer/src/components/formeditor/default_layoutdecoration.h index e4e7a37ee..c8d2aac29 100644 --- a/src/designer/src/components/formeditor/default_layoutdecoration.h +++ b/src/designer/src/components/formeditor/default_layoutdecoration.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 Qt Designer of the Qt Toolkit. |