diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-04-23 11:13:25 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-04-23 11:13:25 +0200 |
| commit | 38b61177f608afce72d4988c9241a888c56d1e95 (patch) | |
| tree | d30caf5c616fc3a8511dccac524c6f52c1cbbea2 /src/shared | |
| parent | 48687fd8a1e64e4071777ce69e2ee23cc11f582f (diff) | |
| parent | c4be740bd6200582fe2a761533ffcf9ecbe37cd1 (diff) | |
| download | qt-creator-38b61177f608afce72d4988c9241a888c56d1e95.tar.gz | |
Merge remote-tracking branch 'origin/2.7'
Conflicts:
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
tests/auto/treeviewfind/treeviewfind.pro
Change-Id: I1ec788373656c947b50d72df6c26c91312469692
Diffstat (limited to 'src/shared')
| m--------- | src/shared/qbs | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/src/shared/qbs b/src/shared/qbs -Subproject 091dc267d3526e7b3d8e05b32a2506aea114f77 +Subproject 29bb66d2fdc863fd5e9b0896fbd862c5b999d54 |