]> source.dussan.org Git - jquery.git/commitdiff
projects / jquery.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1cca081 868e1e2)
Merge branch 'master' of github.com:jquery/jquery into fix-8790-quick-trigger
authorDave Methvin <dave.methvin@gmail.com>
Mon, 11 Apr 2011 15:44:26 +0000 (11:44 -0400)
committerDave Methvin <dave.methvin@gmail.com>
Mon, 11 Apr 2011 15:44:26 +0000 (11:44 -0400)
Conflicts:
src/event.js

1  2 
src/event.js patch | diff1 | diff2 | blob | history

diff --cc src/event.js
Simple merge
jQuery JavaScript Library: https://github.com/jquery/jquery