deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of github.com:jquery/jquery into 1.7/callbacks

Browse source 
Conflicts:
	test/index.html
This commit is contained in:
jaubourg 2011-05-24 00:45:37 +02:00
commit 1ed70e056d
25 changed files with 529 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

1
test/index.html
View file

@ -35,6 +35,7 @@
<script src="data/testrunner.js"></script>
<script src="unit/core.js"></script>
<script src="unit/support.js"></script>
<script src="unit/callbacks.js"></script>
<script src="unit/deferred.js"></script>
<script src="unit/data.js"></script>