Permalink
Browse files

Updated with upstream and added changes

  • Loading branch information...
1 parent 6008ef4 commit da2f7a9c76b32f683759eafb80251e1edc52bd8f @hkasera hkasera committed Sep 24, 2016
Showing with 3 additions and 1 deletion.
  1. +2 −1 Gruntfile.js
  2. +1 −0 demo/index.html
View
@@ -57,7 +57,8 @@ module.exports = function(grunt) {
'src/js/mep-feature-sourcechooser.js',
'src/js/mep-feature-contextmenu.js',
'src/js/mep-feature-skipback.js',
- 'src/js/mep-feature-postroll.js'
+ 'src/js/mep-feature-postroll.js',
+ 'src/js/mep-feature-markers.js'
]),
dest: 'build/mediaelementplayer.js'
},
View
@@ -22,6 +22,7 @@
<li><a href="mediaelementplayer-events.html">MediaElementPlayer - Events</a> - example of attaching events</li>
<li><a href="mediaelementplayer-postroll.html">MediaElementPlayer - Postroll</a> - showing something when video ends</li>
<li><a href="mediaelementplayer-translation.html">MediaElementPlayer - Translations</a> - showing different translations available</li>
+ <li><a href="mediaelementplayer-markers.html">MediaElementPlayer - Markers</a> - example of visual markers on the progress bar</li>
</ul>

0 comments on commit da2f7a9

Please sign in to comment.