diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-22 22:13:32 +0200 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-22 22:13:32 +0200 |
commit | 5f858d319fa3c2fd6ce0e6d0deed081b4c44b7b2 (patch) | |
tree | a1c2bd23b42fcda99070b05afef333a594d04645 /.qmake.conf | |
parent | 0973537c5471288726b929250199a41435729bee (diff) | |
parent | 728f3e7383ac6f7364126bf55684d51dec51cd69 (diff) | |
download | qtserialport-5f858d319fa3c2fd6ce0e6d0deed081b4c44b7b2.tar.gz |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I4694207fc852aefd7302c2db9153c37f304cc3c4
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions