Code Review
/
AGL
/
AGL-repo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix for chinook_3.0.4.xml
[AGL/AGL-repo.git]
/
default.xml
diff --git
a/default.xml
b/default.xml
index
524d920
..
46fb5cc
100644
(file)
--- a/
default.xml
+++ b/
default.xml
@@
-56,7
+56,7
@@
<project name="meta-ti" path="meta-ti" remote="yocto" revision="krogoth" />
<!-- iotivity -->
<project name="meta-ti" path="meta-ti" remote="yocto" revision="krogoth" />
<!-- iotivity -->
- <project name="meta-oic" path="meta-oic" remote="yocto" revision="
1.2.0
" />
+ <project name="meta-oic" path="meta-oic" remote="yocto" revision="
0bdd959e0dee4f63098702c302d1d214ac3d808a
" />
<!-- meta-amb -->
<project name="tripzero/meta-amb" path="meta-amb" remote="github" revision="master" />
<!-- meta-amb -->
<project name="tripzero/meta-amb" path="meta-amb" remote="github" revision="master" />
@@
-71,7
+71,8
@@
<project name="meta-qcom" path="meta-qcom" remote="yocto" revision="krogoth" />
<!-- Image Security Analysis FrameWork (isafw) -->
<project name="meta-qcom" path="meta-qcom" remote="yocto" revision="krogoth" />
<!-- Image Security Analysis FrameWork (isafw) -->
- <project name="meta-security-isafw" path="meta-security-isafw" remote="01org" revision="master" />
+ <!-- use morty branch for CC and DD - conflicting changes in master-->
+ <project name="meta-security-isafw" path="meta-security-isafw" remote="01org" revision="morty" />
<!-- IoT Security layer -->
<project name="meta-intel-iot-security" path="meta-intel-iot-security" remote="01org" revision="20bbb97f6d5400b126ae96ef446c3e60c7e16285" />
<!-- IoT Security layer -->
<project name="meta-intel-iot-security" path="meta-intel-iot-security" remote="01org" revision="20bbb97f6d5400b126ae96ef446c3e60c7e16285" />