diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-24 12:49:23 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-24 12:49:23 +0200 |
| commit | 648d4ae6a3591e916f175e32c12a2ea4f8edb6a9 (patch) | |
| tree | ecd3aaedd0022bc2df0b6bbc24e10fc21a8adb6e /.qmake.conf | |
| parent | 9443e72a92a4d1d717e931ee9149c1e3652e9f53 (diff) | |
| parent | aa1760f84bd711cf56159075630fb71d38a4087b (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I06835511fa131f65470bd9b177cdce75f51b385a
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions