diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-05 10:40:18 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-05 10:40:18 +0200 |
| commit | ac8ff6bca583f73efcf172d89534e95769618abc (patch) | |
| tree | d8af4bec1ba44702c19b07effeb25dbe90af09a6 /sync.profile | |
| parent | f4f7da2d9fd4c197c35e0d3e3820d99e73336a45 (diff) | |
| parent | 9e21979e13304b858301a62d227b7a801b949761 (diff) | |
| download | qtgraphicaleffects-ac8ff6bca583f73efcf172d89534e95769618abc.tar.gz | |
Merge branch 'stable' into dev
Conflicts:
.qmake.conf
Change-Id: I41d9d4027204c02ea486c7665294c2024d3a3aeb
Diffstat (limited to 'sync.profile')
0 files changed, 0 insertions, 0 deletions