heff e225fbffc2 Merge branch 'master' into stable ...

Conflicts:
	dist/video-js/video-js.css
	dist/video-js/video-js.less
	dist/video-js/video-js.min.css
	dist/video-js/video-js.swf
	dist/video-js/video.dev.js
	dist/video-js/video.js
	dist/video-js/video.novtt.dev.js
	dist/video-js/video.novtt.js
	src/css/video-js.less
	src/js/control-bar/time-display.js
	src/js/exports.js
	src/js/lib.js
	src/js/media/flash.js
	src/js/media/flash.rtmp.js
	src/js/media/html5.js
	src/js/media/media.js
	src/js/player.externs.js
	test/unit/api.js
	test/unit/flash.js
	test/unit/media.html5.js
	test/unit/media.js

2015-09-29 09:14:50 -07:00

..

api

Release v4.12.14

2015-08-21 18:21:24 +00:00

examples

Updated build and sample files with IE8 shims

2015-06-05 18:41:05 -07:00

guides

@heff changed component child lists to arrays instead of objects. closes #2477

2015-09-28 15:17:48 -07:00

index.md

Lowercase .js for consistency

2015-04-01 16:51:14 -07:00