Module Name: src
Committed By: christos
Date: Thu Apr 11 16:56:42 UTC 2013
Modified Files:
src/external/bsd/libevent/dist: Doxyfile buffer.c
bufferevent-internal.h bufferevent.c bufferevent_ratelim.c
evbuffer-internal.h evdns.c event-internal.h event.c
event_tagging.c evmap.c evrpc.c evthread-internal.h evutil.c
evutil_rand.c ht-internal.h http.c log-internal.h
ratelim-internal.h select.c util-internal.h
src/external/bsd/libevent/dist/include/event2: rpc.h util.h
src/external/bsd/libevent/dist/test: regress.c regress.h
regress_buffer.c regress_bufferevent.c regress_dns.c regress_et.c
regress_http.c regress_listener.c regress_main.c regress_rpc.c
regress_ssl.c regress_thread.c regress_util.c regress_zlib.c
tinytest_macros.h
Removed Files:
src/external/bsd/libevent/dist: evbuffer.c evdns.3 event.3 evsignal.h
log.h min_heap.h
Log Message:
merge conflicts, make compile with warnings.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/libevent/dist/Doxyfile \
src/external/bsd/libevent/dist/bufferevent-internal.h \
src/external/bsd/libevent/dist/bufferevent.c \
src/external/bsd/libevent/dist/bufferevent_ratelim.c \
src/external/bsd/libevent/dist/evbuffer-internal.h \
src/external/bsd/libevent/dist/evmap.c \
src/external/bsd/libevent/dist/evthread-internal.h \
src/external/bsd/libevent/dist/evutil_rand.c \
src/external/bsd/libevent/dist/ht-internal.h \
src/external/bsd/libevent/dist/log-internal.h \
src/external/bsd/libevent/dist/ratelim-internal.h \
src/external/bsd/libevent/dist/util-internal.h
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/libevent/dist/buffer.c \
src/external/bsd/libevent/dist/evdns.c \
src/external/bsd/libevent/dist/event-internal.h \
src/external/bsd/libevent/dist/event.c \
src/external/bsd/libevent/dist/event_tagging.c \
src/external/bsd/libevent/dist/evrpc.c \
src/external/bsd/libevent/dist/evutil.c \
src/external/bsd/libevent/dist/http.c \
src/external/bsd/libevent/dist/select.c
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/libevent/dist/evbuffer.c \
src/external/bsd/libevent/dist/event.3 \
src/external/bsd/libevent/dist/evsignal.h
cvs rdiff -u -r1.2 -r0 src/external/bsd/libevent/dist/evdns.3 \
src/external/bsd/libevent/dist/log.h \
src/external/bsd/libevent/dist/min_heap.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/bsd/libevent/dist/include/event2/rpc.h \
src/external/bsd/libevent/dist/include/event2/util.h
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/libevent/dist/test/regress.c
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/libevent/dist/test/regress.h \
src/external/bsd/libevent/dist/test/regress_rpc.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/bsd/libevent/dist/test/regress_buffer.c \
src/external/bsd/libevent/dist/test/regress_bufferevent.c \
src/external/bsd/libevent/dist/test/regress_et.c \
src/external/bsd/libevent/dist/test/regress_listener.c \
src/external/bsd/libevent/dist/test/regress_main.c \
src/external/bsd/libevent/dist/test/regress_ssl.c \
src/external/bsd/libevent/dist/test/regress_thread.c \
src/external/bsd/libevent/dist/test/regress_util.c \
src/external/bsd/libevent/dist/test/regress_zlib.c \
src/external/bsd/libevent/dist/test/tinytest_macros.h
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libevent/dist/test/regress_dns.c \
src/external/bsd/libevent/dist/test/regress_http.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
