diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-24 18:28:07 +0200 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-24 18:28:07 +0200 |
commit | 506541c8fca13e6f42b62b5e295513d10a4e5282 (patch) | |
tree | 2bc1dfb4fa3b256976591fbf1daa9985d0a46dd0 /.qmake.conf | |
parent | 7a8cab928dd405973e102ad2e6703cdbbb6bd505 (diff) | |
parent | eff4a0f3fca2e22d4be888cdd7953e1c2ab8c918 (diff) | |
download | qtscript-506541c8fca13e6f42b62b5e295513d10a4e5282.tar.gz |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I9d56563ae7af982f81f21d9d5b1a48d8be8a09cb
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions