diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-01-15 14:04:41 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-01-15 14:04:41 +0100 |
| commit | 851f255b9dfc81c667f02994c0cd3f9cda3f973c (patch) | |
| tree | 0bb41ddef303f0ae8a8635bca360ce4f2489e5fa /dist/changes-2.0.0 | |
| parent | 8ab5b7ec0bc10fc35651f3a1046b26d815c24810 (diff) | |
| parent | 8d04b65ae9d5d35e763146d12023c794c743a3fd (diff) | |
| download | qt-creator-851f255b9dfc81c667f02994c0cd3f9cda3f973c.tar.gz | |
Merge remote-tracking branch 'origin/3.0'
Conflicts:
src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.cpp
src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp
src/plugins/qmlprofiler/qmlprofilertraceview.cpp
Change-Id: I778a0c2d0f1b4f799caaa2c2cc5daf94ec7ca352
Diffstat (limited to 'dist/changes-2.0.0')
0 files changed, 0 insertions, 0 deletions