Merge branch 'master' into jquery-ui

blueimp · blueimp · commit 76a8fe3d1c7e · 2012-07-25T15:32:28.000+02:00
diff --git a/js/vendor/jquery.ui.widget.js b/js/vendor/jquery.ui.widget.js
@@ -1,8 +1,8 @@
 /*
- * jQuery UI Widget 1.8.18+amd
+ * jQuery UI Widget 1.8.22+amd
  * https://github.com/blueimp/jQuery-File-Upload
  *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`/*`
`2`		`- * jQuery UI Widget 1.8.18+amd`
	`2`	`+ * jQuery UI Widget 1.8.22+amd`
`3`	`3`	`* https://github.com/blueimp/jQuery-File-Upload`
`4`	`4`	`*`
`5`		`- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)`
	`5`	`+ * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)`
`6`	`6`	`* Dual licensed under the MIT or GPL Version 2 licenses.`
`7`	`7`	`* http://jquery.org/license`
`8`	`8`	`*`