yaz/commit
Merge branch 'master' of git://eculture.cs.vu.nl/home/vnc/prolog/src/ClioPatria/cpack-mirrors/yaz
author | Michiel Hildebrand |
---|---|
Fri Jan 27 10:27:03 2012 +0100 | |
committer | Michiel Hildebrand |
Fri Jan 27 10:27:03 2012 +0100 | |
commit | 735fd3923da36444583df4f2006e6eb669ebf914 |
tree | 18568309c009b23c03294ebb49436c7139e51f8a |
parent | 95f27612604ec542877de85a7f52dabe008df9a9 558989a486c395bfaa3032b080c9570aa81305dc |
Diff style: stat patch
api/ugm_ingest.pl | 40 +++++++++++++ applications/yaz_player.pl | 12 ++++ lib/video_annotation.pl | 4 ++ web/js/videoplayer/ugslplayer.js | 58 +++++++++++++++++++ web/js/videoplayer/videoplayer.js | 119 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 204 insertions(+), 29 deletions(-)