diff options
author | Max Krummenacher <max.krummenacher@toradex.com> | 2014-02-13 10:30:17 +0100 |
---|---|---|
committer | Max Krummenacher <max.krummenacher@toradex.com> | 2014-02-13 10:30:17 +0100 |
commit | 1ba1e887436f64318cc337390a44036a8c534192 (patch) | |
tree | 106e5bddd0e062a59fd645b10a9ee93b95f76d58 /default.xml | |
parent | 60f196492d09ccf447511eda5b7995cccac8af59 (diff) | |
parent | f072e4c3c0366c2970bf78564f2e62611129eb86 (diff) |
Merge remote branch 'remotes/origin/master' into LinuxImageV2.1Colibri_T30_LinuxImageV2.1Beta2_20140206Colibri_T20_LinuxImageV2.1Beta2_20140207Apalis_T30_LinuxImageV2.1Beta2_20140206
Conflicts:
default.xml
Change-Id: Id920e782e6a59f8a42589ce907c4af4f4c97d358
Diffstat (limited to 'default.xml')
-rw-r--r-- | default.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/default.xml b/default.xml index 10ecdf5..f257fa1 100644 --- a/default.xml +++ b/default.xml @@ -16,7 +16,7 @@ <project remote="gith" revision="2140f2a114f7009f86479afb12a524bb157cbb0e" upstream="dylan" name="OSSystems/meta-browser.git" path="stuff/meta-browser"/> <project remote="linaro" revision="6321a745aba4fc2ddb559d4606b0a98afc8a1ca2" upstream="dylan" name="meta-linaro.git" path="stuff/meta-linaro"/> <project remote="trdx" revision="f69ffe4cebf94f48f02838002dbc3544b3ffb460" upstream="dylan" name="meta-lxde.git" path="stuff/meta-lxde"/> - <project remote="trdx" revision="222af308ba200c645b888b8788f2d4f964b5aa5b" upstream="master" name="meta-toradex.git" path="stuff/meta-toradex"> + <project remote="trdx" revision="2f3884183730f5de556154a354ae94de651eef50" upstream="master" name="meta-toradex.git" path="stuff/meta-toradex"> <copyfile dest="export" src="buildconf/export"/> </project> |