Skip to content
Snippets Groups Projects
Commit 49699692 authored by Samuli Piippo's avatar Samuli Piippo
Browse files

Merge remote-tracking branch 'origin/jethro' into krogoth

* origin/jethro:
  colibri-imx7: use opengldummy for egl and libgles2
  qt5: update submodules
  gdb: correctly enable python for mingw sdk build
  mesa: make sure we get libgles3-dev package in toolchain
  qt5: update submodules
  beaglebone: start qtlauncher only after /dev/fb0 exists
  Update qtdeviceutilities module revision

Conflicts:
	meta-ti-extras/recipes/libgles/libgles-omap3_4.10.00.01.bb
	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
	scripts/manifest.xml

Change-Id: I2f175980f16084c37c5d4032387579dab574952d
parents f0296da6 68b683a8
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment