diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-12 14:11:15 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-12 14:11:15 +0100 |
| commit | 41e685d02ff7c881b90970f6fd8b6c7a2a2831c7 (patch) | |
| tree | f4a3048c58be17b546f620ac22a1cdcd5035490e /.qmake.conf | |
| parent | 70a8761f6c059d18169b6565886dc9159dabebd3 (diff) | |
| parent | b21d397336d52d034ab6db699c26bf3918fe81e6 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I5eed3f81fe220f82d1eba27d7e7a62803fea5e49
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions