summaryrefslogtreecommitdiffstats
path: root/scripts/manifest.xml
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2016-08-26 11:11:05 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2016-08-26 11:11:23 +0300
commit695e3d5e38f2aa75c39b2a788a768364362aa737 (patch)
treea8dfbf8ad06c8808767f9949e642dd7b92284f0f /scripts/manifest.xml
parent0765ab46150bfa6a930487e25ecb0eed365d90f1 (diff)
parent2362b647d370964e87d160d1b4ea8cd7e97104d7 (diff)
downloadmeta-boot2qt-695e3d5e38f2aa75c39b2a788a768364362aa737.tar.gz
Merge remote-tracking branch 'origin/jethro' into dev
* origin/jethro: nitrogen: enable HID_MULTITOUCH kernel module qt5: Update submodules Change-Id: Ibdf8056f13520847721ab1fa248c325323e6d926
Diffstat (limited to 'scripts/manifest.xml')
-rw-r--r--scripts/manifest.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 3354dd2..474e293 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -25,7 +25,7 @@
25 path="sources/meta-openembedded"/> 25 path="sources/meta-openembedded"/>
26 <project name="meta-qt5" 26 <project name="meta-qt5"
27 remote="qtyocto" 27 remote="qtyocto"
28 revision="2746cdba75f411541d80ddfd5cadad2753fe29d3" 28 revision="c82a99ecbeff88ff8a1f6eaa272a352e97992ab1"
29 path="sources/meta-qt5"/> 29 path="sources/meta-qt5"/>
30 <project name="meta-mingw" 30 <project name="meta-mingw"
31 remote="qtyocto" 31 remote="qtyocto"