Steve Heffernan d147b1ae2f Merge branch 'optional_resize' of git://github.com/mente/video-js into mente-optional_resize closes #359 ... Conflicts: test/unit/component.js		2013-03-09 13:18:07 -08:00
..
component.js	vjs.Component.dimension accepts 'auto' as value	2013-03-09 10:39:28 +02:00
controls.js	Reformat var statements	2013-03-05 13:38:47 -05:00
core.js	Update test/unit/core to jshint	2013-02-08 17:18:49 -05:00
events.js	Update test/unit/events to follow jshint	2013-02-08 17:20:46 -05:00
lib.js	update test/unit/lib to adhere to jshint	2013-02-08 17:25:33 -05:00
media.html5.js	Block defineSetter test for older IE	2013-03-05 18:07:35 -05:00
mediafaker.js	Changed to vjs.obj.function naming for object related functions.	2013-01-25 17:36:40 -08:00
player.js	vjs.Component.dimension accepts 'auto' as value	2013-03-09 10:39:28 +02:00
plugins.js	fix test	2013-02-11 16:35:43 -05:00
setup.js	update test/unit/{media.html5,setup}.js to adhere to jshint	2013-02-08 17:27:04 -05:00