Commit 960276cc authored by Frederik Gladhorn's avatar Frederik Gladhorn
Browse files

Merge remote-tracking branch 'origin/release' into stable

Change-Id: I7b83f2a71649fa83d35aad557aebc0468e4a6763
parents c77f7f99 585d3147
No related merge requests found
Showing with 5 additions and 1 deletion
/****************************************************************************
**
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the documentation of the Qt Toolkit.
......@@ -38,4 +38,8 @@
Click on either of the smiley faces to put a notification in the status area of the Android
device.
\include examples-run.qdocinc
\sa {Qt for Android}, {Qt Android Extras}
*/
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment