SteveGilvarry 4d7ded5ef0 Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage ... Conflicts: configure.ac src/Makefile.am web/js/Makefile.am		2016-04-05 22:06:14 +10:00
..
logger.js	handle empty [file] to prevent logzilla	2014-11-13 09:17:54 -05:00
mootools.ext.js	Reverting my web changes in develop - keeping them in modern	2013-05-02 10:20:06 -04:00
overlay.js	Reverting my web changes in develop - keeping them in modern	2013-05-02 10:20:06 -04:00
videojs.zoomrotate.js	added missing videojs.zoomrotate.js file	2015-07-28 23:06:03 +10:00