diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2016-06-06 11:28:09 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-06-06 11:28:09 +0300 |
| commit | d93318a741228ea0275985fe21291761d89900e8 (patch) | |
| tree | 9ff8f475626611dfdc3ff1503ec1430b901b6576 /recipes/udev | |
| parent | d55a3a4ff2ea16b0663be0ec78dabde74ff4a206 (diff) | |
| parent | ab47141905ed04e64160e1c24a9af603e5ecd276 (diff) | |
| download | meta-boot2qt-d93318a741228ea0275985fe21291761d89900e8.tar.gz | |
Merge remote-tracking branch 'origin/fido' into dev
* origin/fido:
otf-noto: update url and license file name
qtmultimedia: make sure audio plugins are built
qt5: update submodules and meta-qt5
Conflicts:
conf/distro/b2qt.conf
recipes-qt/qt5/nativesdk-qtbase_git.bbappend
recipes-qt/qt5/qt3d_git.bbappend
recipes-qt/qt5/qtbase-native_git.bbappend
recipes-qt/qt5/qtbase_git.bbappend
recipes-qt/qt5/qtconnectivity_git.bbappend
recipes-qt/qt5/qtdeclarative_git.bbappend
recipes-qt/qt5/qtlocation_git.bbappend
recipes-qt/qt5/qtmultimedia_git.bbappend
recipes-qt/qt5/qtquickcontrols2_git.bb
recipes-qt/qt5/qtquickcontrols_git.bbappend
recipes-qt/qt5/qtserialbus_git.bb
recipes-qt/qt5/qtsvg_git.bbappend
recipes-qt/qt5/qttools_git.bbappend
recipes-qt/qt5/qttranslations_git.bbappend
recipes-qt/qt5/qtwayland-native_git.bbappend
recipes-qt/qt5/qtwayland_git.bbappend
recipes-qt/qt5/qtwebengine_git.bbappend
recipes-qt/qt5/qtwebsockets_git.bbappend
recipes-qt/qt5/qtxmlpatterns_git.bbappend
scripts/manifest.xml
Change-Id: I54a02e91a49a3be3fa6359b5af69929d63b962e4
Diffstat (limited to 'recipes/udev')
0 files changed, 0 insertions, 0 deletions