diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 17:24:56 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 17:24:56 +0100 |
| commit | 42c568edebcee89dcf14a87c559bc142d7064ff0 (patch) | |
| tree | f15ad373e386a1d8bd25c67a93c82fe49578ccd2 | |
| parent | 2e049836ee16f4aedbe7ccc3335fc57852725716 (diff) | |
| parent | f89d64ca722acf4a1a38c5e136bb01eff2525978 (diff) | |
| download | qtscript-42c568edebcee89dcf14a87c559bc142d7064ff0.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
Change-Id: I312f9535c2b4937f0575dec6491f0d73f2726b28
0 files changed, 0 insertions, 0 deletions