<table><tr><td style="">mart updated this revision to Diff 29514.<br />mart added a comment.

</td><a style="text-decoration: none; padding: 4px 8px; margin: 0 8px 8px; float: right; color: #464C5C; font-weight: bold; border-radius: 3px; background-color: #F7F7F9; background-image: linear-gradient(to bottom,#fff,#f1f0f1); display: inline-block; border: 1px solid rgba(71,87,120,.2);" href="https://phabricator.kde.org/D11316">View Revision</a></tr></table><br /><div><div><ul class="remarkup-list">

<li class="remarkup-list-item">add to qmldir</li>

<li class="remarkup-list-item">Merge branch 'master' into mart/Card</li>

<li class="remarkup-list-item">add more items to qmldir</li>

</ul></div></div><br /><div><strong>REPOSITORY</strong><div><div>R169 Kirigami</div></div></div><br /><div><strong>CHANGES SINCE LAST UPDATE</strong><div><a href="https://phabricator.kde.org/D11316?vs=29502&id=29514">https://phabricator.kde.org/D11316?vs=29502&id=29514</a></div></div><br /><div><strong>BRANCH</strong><div><div>mart/Card</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D11316">https://phabricator.kde.org/D11316</a></div></div><br /><div><strong>AFFECTED FILES</strong><div><div>examples/galleryapp/CMakeLists.txt<br />

examples/galleryapp/resources.qrc<br />

examples/gallerydata/contents/ui/MainPage.qml<br />

examples/gallerydata/contents/ui/gallery/CardsGridViewGallery.qml<br />

examples/gallerydata/contents/ui/gallery/CardsLayoutGallery.qml<br />

examples/gallerydata/contents/ui/gallery/CardsListViewGallery.qml<br />

kirigami.qrc<br />

src/controls/AbstractCard.qml<br />

src/controls/Card.qml<br />

src/controls/CardsGridView.qml<br />

src/controls/CardsLayout.qml<br />

src/controls/CardsListView.qml<br />

src/controls/GlobalDrawer.qml<br />

src/controls/Heading.qml<br />

src/controls/Page.qml<br />

src/controls/ScrollablePage.qml<br />

src/controls/Units.qml<br />

src/controls/plugins.qmltypes<br />

src/controls/private/BannerGroup.qml<br />

src/controls/private/BannerImage.qml<br />

src/controls/private/RefreshableScrollView.qml<br />

src/controls/templates/AbstractApplicationHeader.qml<br />

src/controls/templates/AbstractCard.qml<br />

src/controls/templates/private/ScrollView.qml<br />

src/kirigamiplugin.cpp<br />

src/qmldir</div></div></div><br /><div><strong>To: </strong>mart, Kirigami, davidedmundson<br /><strong>Cc: </strong>apol, ngraham, davidedmundson, progwolff, plasma-devel, mart, hein<br /></div>