diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-02-17 11:21:58 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-02-17 11:21:58 +0100 |
| commit | e1cd7c130b3187c79e09b9068d202592b9313f91 (patch) | |
| tree | 101dd01279c56c9912c93da26da1ff176b70d85d /qtmacextras | |
| parent | 17e103bb5de5a2da841a463841b216ced1e44b5d (diff) | |
| parent | fe236cc44c61eab39bec31a5ac9c0647934b03af (diff) | |
Merge remote-tracking branch 'origin/stable' into release
Conflicts:
qtxmlpatterns
Change-Id: Ida8491147bce712af45ab55cea7d9bd14ca9b9eb
Diffstat (limited to 'qtmacextras')
| m--------- | qtmacextras | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/qtmacextras b/qtmacextras -Subproject df23cbf333978facc53185bbdf58219c74baf39 +Subproject 39ccd598cd36b01e3b876f55030c639a9bc3968 |