Ian Gilman 732cd87a10 Merge branch 'collections' into m2 ... fixed Conflicts: changelog.txt		2015-01-19 10:45:26 -08:00
..
data	Fixing 2.0 test info.json	2014-09-04 12:28:52 -07:00
demo	Resize (m2)	2015-01-15 14:32:42 -08:00
helpers	Merge branch 'master' into collections	2015-01-19 10:35:31 -08:00
lib	Merge branch 'master' of github.com:openseadragon/openseadragon into issue37-navigator	2013-03-23 21:44:22 -04:00
modules	Merge branch 'master' into collections	2015-01-13 14:11:52 -08:00
coverage.html	Moved viewport test	2015-01-02 14:25:42 -08:00
test.html	Moved viewport test	2015-01-02 14:25:42 -08:00