commit 4ca60b146b4d5812e9ff7c4a754ff9d564807c9b
author Avery Pennarun <apenwarr@gmail.com> Wed Nov 27 03:24:13 2013 -0500
committer Avery Pennarun <apenwarr@gmail.com> Wed Nov 27 03:24:13 2013 -0500
tree 27b56a20dd26feeecd55f52a82bf9bd8b69d04ef
parent 473673d2828380194378bf57e64a01150389ec52
parent 5d194d5cc6779578fffee6ad7802fa2050974dc0

Merge branch 'openbox-internal' into openbox

* openbox-internal:
  Remove manifest from manifest.
  Add miracast project to manifest
  Add vendor/qualcomm/switch
  Add vendor/google/oregano
  Add mindspeed toolchain.
  Add vendor/broadcom/chromium
  add barebox
  Added vendor/opensource/pf_ring.
  Add vendor/opensource/dial
  Add vendor/qualcomm/drivers
  Add uboot/mindspeed.
  Add vendor/mindspeed/drivers
  Add kernel/mindspeed
  Add vendor/google/prism
  Add toolchains/kvm.
  Add vendor/ookla
  Add ts_check project.
  Merge prism.xml into default.xml.
  Add vudu repo in default.xml.
  Add a <manifest-server> URL so 'repo sync -s' will work.
  Remove manifest from manifest.
  Add vendor/broadcom/cfe-bin.
  Add opensource/tarballs to prism.
  Add manifest file for ONT(prism).
  .

Conflicts:
	default.xml

Change-Id: I021167e287f6e2055da6ee861f0bb169a342ad5a

default.xml

diff --git a/default.xml b/default.xml
index b9e9a65..4a4aa5a 100644
--- a/default.xml
+++ b/default.xml
@@ -6,21 +6,26 @@
     review="https://gfiber-review.googlesource.com/"/>
   <default remote="origin" revision="master" sync-j="12"/>
 
-  <project name="manifests" path="manifest"/>
   <project name="toolchains/bruno"/>
+  <project name="toolchains/kvm"/>
+  <project name="toolchains/mindspeed"/>
+  <project name="toolchains/prism"/>
   <project name="kernel/bruno"/>
-  <project name="vendor/opensource/toolbox" path="toolbox-for-linux"/>
+  <project name="kernel/prism"/>
   <project name="buildroot"/>
   <project name="vendor/humax/misc"/>
   <project name="vendor/google/catawampus"/>
   <project name="vendor/google/jtux"/>
   <project name="vendor/google/platform"/>
   <project name="vendor/google/swscale"/>
+  <project name="vendor/google/test"/>
+  <project name="vendor/opensource/dial"/>
   <project name="vendor/opensource/ffmpeg"/>
   <project name="vendor/opensource/hdhomerun_plugin"/>
   <project name="vendor/opensource/libjingle"/>
   <project name="vendor/opensource/fallocate"/>
   <project name="vendor/opensource/projectM"/>
   <project name="vendor/opensource/tarballs"/>
+  <project name="vendor/opensource/toolbox" path="toolbox-for-linux"/>
   <project name="vendor/opensource/webrtc"/>
 </manifest>