Merge remote-tracking branch 'origin/master'
authorVladimir Minenko <vladimir.minenko@nokia.com>
Thu, 26 May 2011 13:56:47 +0000 (15:56 +0200)
committerVladimir Minenko <vladimir.minenko@nokia.com>
Thu, 26 May 2011 13:56:47 +0000 (15:56 +0200)
commitaff6cbac0eeaa0f1184cfa6f69818827b71cb222
tree93b579a4879a8c9d33dbcdbafffe8fb363d71c78
parent4ec80735d3e8bdbc4e38288c974426e77eedcd00
parent0f8eddaf60e3854aeda4c5d16cd740cc510ca941
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
doc/src/external-resources.qdoc
doc/src/getting-started/how-to-learn-qt.qdoc
doc/src/qt-webpages.qdoc