Steve Heffernan 624bf16070 Merge branch 'master' into fix-flash-ready ...

Conflicts:
	src/js/media/flash.js
	test/unit/flash.js

2014-07-28 17:27:29 -07:00

..

unit

Merge branch 'master' into fix-flash-ready

2014-07-28 17:27:29 -07:00

index.html

Better error handling. closes #1197

2014-05-12 17:08:48 -07:00

karma-qunit-shim.js

Close GH-714: Added support for running tests with Karma.

2013-09-19 09:24:06 -07:00

karma.conf.js

Added additional browsers for saucelabs testing. closes #1216

2014-07-08 11:46:02 -07:00

karma.minified.api.conf.js

Added cross-browser testing with SauceLabs, and added Karma as the default test runner. closes #1187

2014-05-16 14:48:05 -07:00

karma.minified.conf.js

Added cross-browser testing with SauceLabs, and added Karma as the default test runner. closes #1187

2014-05-16 14:48:05 -07:00

minified-api.html

Better error handling. closes #1197

2014-05-12 17:08:48 -07:00

minified.html

Better error handling. closes #1197

2014-05-12 17:08:48 -07:00

qunit-externs.js

Better error handling. closes #1197

2014-05-12 17:08:48 -07:00

sinon-externs.js

Better error handling. closes #1197

2014-05-12 17:08:48 -07:00