mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2024-11-25 06:36:11 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into collections

Browse Source 
Fixed Conflicts:
	changelog.txt
This commit is contained in:
Ian Gilman 2015-01-30 09:43:55 -08:00
commit a494cc8a58
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changelog.txt
View File

@ -41,7 +41,9 @@ OPENSEADRAGON CHANGELOG
* imageLoaderLimit now works (#544) * imageLoaderLimit now works (#544)
* Added ajaxWithCredentials option (#543) * Added ajaxWithCredentials option (#543)
1.2.1: (in progress) 1.2.2: (in progress)
1.2.1:
* Added preserveOverlays option (#561) * Added preserveOverlays option (#561)
* Fixed: DZI tilesource was broken on IE8/IE9 (#563) * Fixed: DZI tilesource was broken on IE8/IE9 (#563)

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "OpenSeadragon", "name": "OpenSeadragon",
"version": "1.2.0", "version": "1.2.1",
"description": "Provides a smooth, zoomable user interface for HTML/Javascript.", "description": "Provides a smooth, zoomable user interface for HTML/Javascript.",
"devDependencies": { "devDependencies": {
"grunt": "^0.4.5", "grunt": "^0.4.5",