diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-05-23 15:30:52 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-05-23 15:46:50 +0200 |
| commit | f89dd01d1987cdbf3de9927227d7345f2a43bdf5 (patch) | |
| tree | b784ad221113afe496c388d8afef907700618bc0 /qtx11extras | |
| parent | 3f9837797d4fc5226d4f6063ee6a52b349521155 (diff) | |
| parent | 292a7a74309c378c8164dba7de4264fe4ad341de (diff) | |
Merge branch 'stable' into release
Conflicts:
README
qtwebkit-examples-and-demos
Change-Id: I23089d0f8a555d78e14f88bc55a48a78fe4a0e53
Diffstat (limited to 'qtx11extras')
| m--------- | qtx11extras | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/qtx11extras b/qtx11extras new file mode 160000 +Subproject a03d4ddf0a8eda87e6a9043259f224a03d4bc68 |