summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2016-09-06 13:56:41 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2016-09-06 13:56:41 +0000
commit03283e38485649f210e547042dfa6a341485f613 (patch)
tree27b8bc7208b1521f2b7cd83bf98939e45f278c0a /scripts
parent2a10f40a40bcfb5ff31397c8a2cac19113208488 (diff)
parent695e3d5e38f2aa75c39b2a788a768364362aa737 (diff)
downloadmeta-boot2qt-03283e38485649f210e547042dfa6a341485f613.tar.gz
Merge "Merge remote-tracking branch 'origin/jethro' into dev" into refs/staging/dev
Diffstat (limited to 'scripts')
-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"