From 14c64f197fc23b78b7999c1b5876d202fc9a3d58 Mon Sep 17 00:00:00 2001 From: Steve Heffernan Date: Tue, 29 Jul 2014 16:03:30 -0700 Subject: [PATCH] Added line to changelog for #1363 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 48975396a..146f3bf9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ CHANGELOG * Fixed an error that could happen if Flash was diposed before the ready callback was fired ([view](https://github.com/videojs/video.js/pull/1340)) * The up and down arrows can now be used to control sliders in addition to left and right ([view](https://github.com/videojs/video.js/pull/1345)) * Added a player.currentType() function to get the MIME type of the current source ([view](https://github.com/videojs/video.js/pull/1320)) +* Fixed a potential conflict with other event listener shims ([view](https://github.com/videojs/video.js/pull/1363)) --------------------