diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2016-09-30 14:24:51 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2016-10-04 12:23:45 +0300 |
| commit | d4066f7473a9deee26c2a6c564f733b51af773bb (patch) | |
| tree | f913ca788beb47a513d2bb2d91e72e9235fd4bd3 /recipes/initramfs-basic/initramfs-basic.bb | |
| parent | 9785aefe8a6fea45325bc1ad1e23ab88f8900f5c (diff) | |
| parent | ab693fb13c88b7134733455c5cb1706813e44e3d (diff) | |
| download | meta-boot2qt-d4066f7473a9deee26c2a6c564f733b51af773bb.tar.gz | |
Merge remote-tracking branch 'origin/fido' into jethro
origin/fido:
qt5: update submodules
Add connman patch to disable connman with boot over nfs
Conflicts:
recipes-qt/qt5/nativesdk-qtbase_git.bbappend
recipes-qt/qt5/qtbase-native_git.bbappend
recipes-qt/qt5/qtbase_git.bbappend
recipes-qt/qt5/qtwebengine_git.bbappend
Change-Id: Ie5a4e534f4a24034750e8c3964fbb5574ce434cd
Diffstat (limited to 'recipes/initramfs-basic/initramfs-basic.bb')
0 files changed, 0 insertions, 0 deletions