diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-13 16:43:06 +0200 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-13 16:43:06 +0200 |
commit | 7a8cab928dd405973e102ad2e6703cdbbb6bd505 (patch) | |
tree | d090a99f81d9889dae9ef4984b438edc1d6767ec /.qmake.conf | |
parent | b4719a8cdeffc3991a63fed7df6489509173ebcd (diff) | |
parent | 1f8aa220b50eb83205279441769fa697730b3e6f (diff) | |
download | qtscript-7a8cab928dd405973e102ad2e6703cdbbb6bd505.tar.gz |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ia10bb1e8b5fa8bb93e76bf2e295df5c10336e582
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions