1
0
mirror of https://github.com/videojs/video.js.git synced 2025-01-02 06:32:07 +02:00

Merge branch 'hotfix/doc-change'

Conflicts:
	CHANGELOG.md
	VERSION.yml
This commit is contained in:
Steve Heffernan 2012-01-12 13:33:02 -08:00
commit f9c1905840
3 changed files with 5 additions and 1 deletions

View File

@ -5,3 +5,5 @@
CHANGELOG
=========
---- 3.0.3 / 2012-01-12 / doc-change -------------------------------------------
* Added line to docs to test zenflow

View File

@ -1,3 +1,4 @@
---
major: 3
patch: 3
minor: 0
patch: 2

View File

@ -226,6 +226,7 @@ You can also remove the listeners later.
### Event Types
List of player events you can add listeners for.
<table border="0" cellspacing="5" cellpadding="5">
<tr><th>Name</th><th>Description</th></tr>