Ian Gilman 6b0e44d037 Merge branch 'collections' into ian2 ...

fixed Conflicts:
	test/demo/collections/main.js

2014-12-03 13:37:44 -08:00

..

data

Fixing 2.0 test info.json

2014-09-04 12:28:52 -07:00

demo

Merge branch 'collections' into ian2

2014-12-03 13:37:44 -08:00

helpers

Testing deprecations

2014-11-20 16:02:02 -08:00

lib

Merge branch 'master' of github.com:openseadragon/openseadragon into issue37-navigator

2013-03-23 21:44:22 -04:00

modules

Test for tiledImage animation

2014-12-02 13:29:52 -08:00

coverage.html

Testing deprecations

2014-11-20 16:02:02 -08:00

test.html

Testing deprecations

2014-11-20 16:02:02 -08:00

viewport.js

Incorporate code review feedback, add a times method to the Rect class.

2014-10-29 09:42:19 -07:00