Merge branch 'master' into SupplyFrame-issue-464

fixed Conflicts:
	changelog.txt
This commit is contained in:
Ian Gilman 2014-11-10 09:36:30 -08:00
commit d6853b9d6d

View File

@ -19,6 +19,7 @@ OPENSEADRAGON CHANGELOG
* Pinch rotate is now available (defaults to off) (#468) * Pinch rotate is now available (defaults to off) (#468)
* Added option for home button to fill viewer (#474) * Added option for home button to fill viewer (#474)
* Now handling iframe/frame mouseouts properly (#481) * Now handling iframe/frame mouseouts properly (#481)
* Better handling of mid-update image loaded callbacks (#409)
1.1.1: 1.1.1: