diff options
author | Sergio Ahumada <sahumada@blackberry.com> | 2014-03-13 15:57:03 +0100 |
---|---|---|
committer | Sergio Ahumada <sahumada@blackberry.com> | 2014-03-13 15:57:11 +0100 |
commit | 27016b89ae49da091527548af0ca9022ec4d7902 (patch) | |
tree | de408d49d52dd6a73e75a612ef51342d6ee44638 /doc | |
parent | 3683bc97d2ebc0de3272fc09656b90a88f5eb326 (diff) | |
parent | fbaa6d3ca6fc2693c5c8a1cd8e565803adc97730 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Idec54e19963e8d88c711cb179cffc81596323899
Diffstat (limited to 'doc')
-rw-r--r-- | doc/global/externalsites/qtcreator.qdoc | 8 | ||||
-rw-r--r-- | doc/src/images/codecs-example.png | bin | 20593 -> 0 bytes |
2 files changed, 8 insertions, 0 deletions
diff --git a/doc/global/externalsites/qtcreator.qdoc b/doc/global/externalsites/qtcreator.qdoc index 15a4125250..2edb3769fd 100644 --- a/doc/global/externalsites/qtcreator.qdoc +++ b/doc/global/externalsites/qtcreator.qdoc @@ -475,3 +475,11 @@ \externalpage http://qt-project.org/doc/qtcreator/creator-diff-editor.html \title Qt Creator: Comparing Files */ +/*! + \externalpage http://qt-project.org/doc/qtcreator/creator-beautifier.html + \title Qt Creator: Beautifying Source Code +*/ +/*! + \externalpage http://qt-project.org/doc/qtcreator/creator-developing-winrt.html + \title Qt Creator: Connecting Windows Runtime Devices +*/ diff --git a/doc/src/images/codecs-example.png b/doc/src/images/codecs-example.png Binary files differdeleted file mode 100644 index 8e7ae95317..0000000000 --- a/doc/src/images/codecs-example.png +++ /dev/null |