[Commits] [fluid-project/videoPlayer] 2913f7: Merge remote-tracking branch 'michelle/FLUID-4553'

GitHub noreply at github.com
Fri Jan 13 19:53:30 UTC 2012

  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/videoPlayer
  Commit: 2913f71225c84cbf998ebd5dcf4ce37da511c25f
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2012-01-13 (Fri, 13 Jan 2012)

  Changed paths:
    A demos/ReorganizeFuture.en.json
  A demos/ReorganizeFuture.fr.json
  A demos/ReorganizeFuture.mp4
  A demos/ReorganizeFuture.webm
  R demos/Richard.Stallman.de.json
  R demos/Richard.Stallman.en.json
  M demos/VideoPlayer.html
  M js/VideoPlayer_captionner.js

  Log Message:
  Merge remote-tracking branch 'michelle/FLUID-4553'

* michelle/FLUID-4553:
  FLUID-4553: Removing the captions for the Richard Stallman video and chaning the demo to use the french captions when they are selected.
  FLUID-4553: Adding the french captions as translated by Google translate.
  FLUID-4553: Adding english captions for the reorganize future video.
  FLUID-4553: Adding the reorganize future video.

More information about the Commits mailing list