diff options
| author | Vladimir Minenko <vladimir.minenko@nokia.com> | 2011-05-26 13:56:47 (GMT) |
|---|---|---|
| committer | Vladimir Minenko <vladimir.minenko@nokia.com> | 2011-05-26 13:56:47 (GMT) |
| commit | aff6cbac0eeaa0f1184cfa6f69818827b71cb222 (patch) | |
| tree | 93b579a4879a8c9d33dbcdbafffe8fb363d71c78 /doc/src/external-resources.qdoc | |
| parent | 4ec80735d3e8bdbc4e38288c974426e77eedcd00 (diff) | |
| parent | 0f8eddaf60e3854aeda4c5d16cd740cc510ca941 (diff) | |
| download | Qt-aff6cbac0eeaa0f1184cfa6f69818827b71cb222.zip Qt-aff6cbac0eeaa0f1184cfa6f69818827b71cb222.tar.gz Qt-aff6cbac0eeaa0f1184cfa6f69818827b71cb222.tar.bz2 | |
Merge remote-tracking branch 'origin/master'
Conflicts:
doc/src/external-resources.qdoc
doc/src/getting-started/how-to-learn-qt.qdoc
"external-resources.qdoc" manually merged
"how-to-learn-qt.qdoc" was unchanged, so it was updated to a new, reworked version from the working area
Diffstat (limited to 'doc/src/external-resources.qdoc')
| -rw-r--r-- | doc/src/external-resources.qdoc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc index d601ba9..d70cd43 100644 --- a/doc/src/external-resources.qdoc +++ b/doc/src/external-resources.qdoc @@ -485,11 +485,11 @@ */ /*! - \externalpage - \title + \externalpage http://accessibility.linuxfoundation.org/a11yspecs/ia2/docs/html/_accessible_event_i_d_8idl.html + \title AccessibleEventID.idl File Reference */ /*! - \externalpage - \title + \externalpage http://msdn.microsoft.com/en-us/library/dd318066.aspx + \title Microsoft Active Accessibility Event Constants */ |