diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-04 19:53:52 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-04 19:53:52 +0200 |
| commit | 29528c5545a74780c5911127e272e594d01b81c0 (patch) | |
| tree | ccf7e906077ed5692b414eb9d4a935312c663746 /src/x11extras/doc/qtx11extras.qdocconf | |
| parent | be0436b2c728e84cd574a9819872336a7fc04121 (diff) | |
| parent | 30fd950a6540cc1a357ebd85919d84fa2651576c (diff) | |
| download | qtx11extras-29528c5545a74780c5911127e272e594d01b81c0.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
sync.profile
Change-Id: I5738cd6ace4c7896fae45d1922c9a6b44a8eac78
Diffstat (limited to 'src/x11extras/doc/qtx11extras.qdocconf')
0 files changed, 0 insertions, 0 deletions