summaryrefslogtreecommitdiffstats
path: root/qtwebkit-examples
Commit message (Collapse)AuthorAgeFilesLines
* Updated submodules.Qt Submodule Update Bot2013-06-161-0/+0
| | | | | Change-Id: I3a55bb51ac59f7e66b8a75f574e494a8da0a2754 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Merge branch 'stable' into devOswald Buddenhagen2013-05-021-0/+0
| | | | | | | | | | | | the sha1s of existing modules were skipped (the update bot will handle them as usual). all newly appeared modules got their sha1s forward-merged. Conflicts: .gitmodules qt.pro <plenty of submodules> Change-Id: I724998c2011f274c3aea5996a7fdbe303d246551
* renamed qtwebkit-examples-and-demos => qtwebkit-examplesOswald Buddenhagen2013-05-011-0/+0
Change-Id: I66b3df6c472715c6600a07fe4746bb11bad81a21 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Simo Fält <simo.falt@digia.com>