Mateus Dalepiane 77c6bbf500 Merge branch '090-new-videodock' into mconf-live0.6.1		2014-09-03 16:39:03 -03:00
..
dev	- update join-mock.xml with new params	2010-07-15 10:30:36 -04:00
prod	Merge branch '090-new-videodock' into mconf-live0.6.1	2014-09-03 16:39:03 -03:00
config.xml.template	Merge remote-tracking branch 'origin/new-videodock' into 090-new-videodock	2014-08-26 17:20:00 -03:00
streams.xml	- build BBB default style	2012-12-28 17:32:14 +00:00