diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-12 12:47:02 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-12 12:47:02 +0200 |
| commit | 74e4b59ec8eeeb22592d90647829d95d5940d827 (patch) | |
| tree | 8addf534e10e75d4c68d42e26c7970b915134196 /sync.profile | |
| parent | 06eab796bafa48c9e1a7e6c389bec84b8f42bd49 (diff) | |
| parent | 9f484eae83fd81e12aa4f07398ad13f9d453ba92 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/plugins/plugins.pro
Change-Id: Ieec8b5984b0fba97872bf96c38410369dc0e20cf
Diffstat (limited to 'sync.profile')
0 files changed, 0 insertions, 0 deletions