vumix/commit
Merge branch 'master' of vu:git/ClioPatria/vumix
author | Michiel Hildebrand |
---|---|
Fri Mar 30 13:42:11 2012 +0200 | |
committer | Michiel Hildebrand |
Fri Mar 30 13:42:11 2012 +0200 | |
commit | c64d36346e1cb02aaa9f5043d919acc65c8b8f8d |
tree | 86feb31e3aca550d7ae2d69eb785a9f9b9c98184 |
parent | 6dc43acbbf1670c498b2f9c0a763d30c81821068 f7a08e32d324f221386634c2368f80b2ed5799b2 |
Diff style: stat patch
applications/vumix.pl | 124 ++++++++++++++++++++++ config-available/load_mbh_example.pl | 2 ++ lib/experiment.pl | 91 ++++++++++++++++ rdf/mbh_example.ttl | 29 +++++ rdf/mbh_test_fragments.ttl | 199 +++++++++++++++++++++++++++++++++++ web/css/vumix.css | 25 +++++ web/js/textedit.js | 4 ++ web/js/vuplayer/videoplayer.js | 4 ++ 8 files changed, 432 insertions(+), 46 deletions(-)