commit f02f0b716fdc66d961c7cafd204d90bd6c0da587
author Avery Pennarun <apenwarr@gmail.com> Mon Jan 06 23:24:50 2014 -0500
committer Avery Pennarun <apenwarr@gmail.com> Mon Jan 06 23:24:50 2014 -0500
tree b4024da32f7efda53b7379538a27efd2c17177ce
parent 4ca60b146b4d5812e9ff7c4a754ff9d564807c9b
parent c687f84ed2c38a6c9c1a745ff277385cfb0b14d6

Merge remote-tracking branch 'origin/master' into openbox

* origin/master:
  Add vendor/firmware repo

Conflicts:
	default.xml

Change-Id: Ia9b9e028afb86c44e2dbf53645a42a2b51124cc1

default.xml

diff --git a/default.xml b/default.xml
index 4a4aa5a..091f843 100644
--- a/default.xml
+++ b/default.xml
@@ -13,6 +13,7 @@
   <project name="kernel/bruno"/>
   <project name="kernel/prism"/>
   <project name="buildroot"/>
+  <project name="vendor/firmware"/>
   <project name="vendor/humax/misc"/>
   <project name="vendor/google/catawampus"/>
   <project name="vendor/google/jtux"/>