Updated with upstream and added changes

mediaelement · Sep 24, 2016 · 8753deb · 8753deb
1 parent 442c1a7
commit 8753deb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -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'
             },

diff --git a/demo/index.html b/demo/index.html
@@ -22,6 +22,7 @@ <h1>MediaElement.js</h1>
 	<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>