]> granicus.if.org Git - libevent/commitdiff
projects / libevent / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4ab2a89 c621359)
Merge remote branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Wed, 23 Mar 2011 20:34:58 +0000 (16:34 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 23 Mar 2011 20:34:58 +0000 (16:34 -0400)
1  2 
Makefile.am patch | diff1 | diff2 | blob | history
configure.in patch | diff1 | diff2 | blob | history

diff --cc Makefile.am
Simple merge
diff --cc configure.in
Simple merge
Unnamed repository; edit this file 'description' to name the repository.