diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-09 00:52:22 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-09 00:52:22 +0200 |
| commit | 72d37d211069932b91650af1e94eee154ace78dd (patch) | |
| tree | cca10b2b0439542e98045fb46d4c9742c67330a9 | |
| parent | 3aa5cc66a71a5215ecf5c47c027265c576ac1a5a (diff) | |
| parent | 82abf6975b6737259ee656564e5ec7f8ad1d0508 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
Change-Id: I5a75f8070bf8e0c4fb52ee8eabecba2fa75b5f1f
0 files changed, 0 insertions, 0 deletions