tree 7e4a657a91883a2fdea7881e62c0694d3c35b49b
parent 7b81ee642bea8a6050f8b743f7073ab5f7d91cf3
parent a0388e94426714d4df501ebfe2c7b046bb90da80
author Avery Pennarun <apenwarr@gmail.com> 1411499655 -0400
committer Avery Pennarun <apenwarr@gmail.com> 1411499655 -0400

Merge branch 'openbox' of /ssd/athena/.repo/manifests.bak

* 'openbox' of /ssd/athena/.repo/manifests.bak:
  Revert "Add Google miracast project to manifest"
  Add Google miracast project to manifest
  Add vendor/google/tarballs
  Move /vendor/broadcom/cfe-bin to /loader-bin
  Add vendor/mindspeed/loader-bin
  Added loader-bin project
  Change default revision to absolute path

Conflicts:
	default.xml