diff options
author | aavit <eirik.aavitsland@digia.com> | 2014-01-17 10:04:40 +0100 |
---|---|---|
committer | aavit <eirik.aavitsland@digia.com> | 2014-01-17 10:06:10 +0100 |
commit | 4e6b5d1c692bdcacdbf09955af67fc930c9a35a5 (patch) | |
tree | 3dc00ed63e88301f1c4ebeaeb353cca69f2103cb /src/doppelganger/main.cpp | |
parent | 5980f4bff613e109375d3d841b2891847011074d (diff) | |
parent | 59649939d06664d722046cd54e0933c5b402e9a9 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/doc/src/b2qt.qdoc
Change-Id: I9d345dcc689e751b997df797ce12b6cd8a14ffb9
Diffstat (limited to 'src/doppelganger/main.cpp')
-rw-r--r-- | src/doppelganger/main.cpp | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/src/doppelganger/main.cpp b/src/doppelganger/main.cpp index 9255576..6813b75 100644 --- a/src/doppelganger/main.cpp +++ b/src/doppelganger/main.cpp @@ -1,3 +1,21 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc +** All rights reserved. +** For any questions to Digia, please use the contact form at +** http://qt.digia.com/ +** +** This file is part of Qt Enterprise Embedded. +** +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** the contact form at http://qt.digia.com/ +** +****************************************************************************/ #include <binder/IPCThreadState.h> #include "permissioncontroller.h" |