aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorjaubourg <j@ubourg.net>2010-12-31 04:21:08 +0100
committerjaubourg <j@ubourg.net>2010-12-31 04:21:08 +0100
commit7e2810fa950f24055384e0b3be5b282183540c39 (patch)
tree3a6781e22807fcf639a8a108630762fe00384568 /test
parent6fb9759a75bf2b9a2aa3a8fce9cd7afc011d8c4f (diff)
parent7b1e873cd9656ab9184242cba708faecd5f46c3d (diff)
downloadjquery-7e2810fa950f24055384e0b3be5b282183540c39.tar.gz
jquery-7e2810fa950f24055384e0b3be5b282183540c39.zip
Merge branch 'deferred' of github.com:jquery/jquery into deferred
Conflicts: Rakefile src/ajax.js
Diffstat (limited to 'test')
0 files changed, 0 insertions, 0 deletions