Merge remote branch 'upstream/master' into getString-error

This commit is contained in:
Heath Nielson 2013-04-10 10:51:33 -06:00
commit e05e04c7b2
2 changed files with 2 additions and 2 deletions

View File

@ -64,7 +64,7 @@ module.exports = function(grunt) {
banner: "//! <%= pkg.name %> <%= pkg.version %>\n" banner: "//! <%= pkg.name %> <%= pkg.version %>\n"
+ "//! Built on <%= grunt.template.today('yyyy-mm-dd') %>\n" + "//! Built on <%= grunt.template.today('yyyy-mm-dd') %>\n"
+ "//! Git commit: <%= gitInfo %>\n" + "//! Git commit: <%= gitInfo %>\n"
+ "//! http://openseadragon.github.com\n\n", + "//! http://openseadragon.github.io\n\n",
process: true process: true
}, },
dist: { dist: {

View File

@ -4,7 +4,7 @@ This project is a fork of the OpenSeadragon project at http://openseadragon.code
## On the Web ## On the Web
http://openseadragon.github.com/ http://openseadragon.github.io/
## First Time Setup ## First Time Setup