git.asbjorn.biz
/
jquery.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cd297dd
)
Updated licensing info.
author
John Resig
<jeresig@gmail.com>
Sat, 22 Apr 2006 06:24:10 +0000
(06:24 +0000)
committer
John Resig
<jeresig@gmail.com>
Sat, 22 Apr 2006 06:24:10 +0000
(06:24 +0000)
jquery/jquery.js
patch
|
blob
|
history
diff --git
a/jquery/jquery.js
b/jquery/jquery.js
index
07fcdff
..
4a960a9
100644
(file)
--- a/
jquery/jquery.js
+++ b/
jquery/jquery.js
@@
-1,7
+1,9
@@
/*
/*
- * JQuery (http://jquery.com/)
- * By John Resig (http://ejohn.org/)
- * Under an Attribution, Share Alike License
+ * jQuery (jquery.com)
+ *
+ * Copyright (c) 2006 John Resig (ejohn.org)
+ * Licensed under the MIT License:
+ * http://www.opensource.org/licenses/mit-license.php
*
* $Date$
* $Rev$
*
* $Date$
* $Rev$
@@
-756,4
+758,4
@@
$.fn.text = function(e) {
setTimeout(function(){
if ( typeof Prototype != "undefined" && $.g == null && $.clean == null )
throw "Error: You are overwriting jQuery, please include jQuery last.";
setTimeout(function(){
if ( typeof Prototype != "undefined" && $.g == null && $.clean == null )
throw "Error: You are overwriting jQuery, please include jQuery last.";
-}, 1000);
\ No newline at end of file
+}, 1000);