diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-06-07 13:46:00 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-06-07 13:46:00 +0200 |
| commit | d487c74a7f6a18a106314d3dc58013c6cfc2e1ca (patch) | |
| tree | a061010dd8503d6263b72513a454aa5d2356ac5f /src/plugins/sensors/ios/iosgyroscope.mm | |
| parent | 102bdf35b13f1b60df26052341ebc5a2833518c7 (diff) | |
| parent | 5ae30e1ae8de41478476567148846a80cd508e7b (diff) | |
Merge branch 'stable' into dev
Conflicts:
.qmake.conf
sync.profile
Change-Id: I0eaa022110b99fc5bc7cdf6304b5cda3ad3e8f8c
Diffstat (limited to 'src/plugins/sensors/ios/iosgyroscope.mm')
0 files changed, 0 insertions, 0 deletions