diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-03-22 10:21:59 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-03-22 10:21:59 +0100 |
| commit | 26e76d3387c4053a334a08d2b0ca22b9e4b18f6c (patch) | |
| tree | d8f8e307a28d02869225a75942757829ecfd0dbf /src/plugins/coreplugin/locator/executefilter.cpp | |
| parent | 505cf814b98194def4a5dcb4a62ae9998002049a (diff) | |
| parent | 991f5eb6a5699c07c6471fcd6c148e507c694adf (diff) | |
Merge remote-tracking branch 'origin/4.2' into 4.3
Conflicts:
src/libs/modelinglib/qmt/diagram_scene/items/classitem.cpp
Change-Id: Ic9215ea50fdbe71610da893cc7999cc1e65b0690
Diffstat (limited to 'src/plugins/coreplugin/locator/executefilter.cpp')
0 files changed, 0 insertions, 0 deletions