diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-19 21:12:09 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-19 21:12:09 +0200 |
| commit | f9a84d50341d1f57452c412d2bb1280eace61f76 (patch) | |
| tree | e8f1752bab55569331a06fa82ea20686ab674a28 /src/layouts/qgridlayoutengine.cpp | |
| parent | 1f8ee02fbc06f822ee131fdd395c8e8cd244601d (diff) | |
| parent | 09a74592234c84b3e428b452d844eaa1f6451040 (diff) | |
Merge branch 'stable' into dev
Conflicts:
tests/auto/controls/data/tst_splitview.qml
Change-Id: I07a169238e747d953b555911790fa782888b85e8
Diffstat (limited to 'src/layouts/qgridlayoutengine.cpp')
0 files changed, 0 insertions, 0 deletions