Module Name: src
Committed By: christos
Date: Tue Jan 31 23:17:40 UTC 2017
Modified Files:
src/external/bsd/libevent: Makefile.inc
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 log.c ltmain.sh
minheap-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
src/external/bsd/libevent/include/event2: event-config.h
src/external/bsd/libevent/lib/libevent: Makefile
Added Files:
src/external/bsd/libevent/include: config.h evconfig-private.h
Removed Files:
src/external/bsd/libevent/dist: README configure.in evdns.h event.h
evhttp.h evrpc.h evutil.h
src/external/bsd/libevent/dist/WIN32-Code/event2: event-config.h
src/external/bsd/libevent/dist/include: Makefile.am Makefile.in
src/external/bsd/libevent/dist/sample: Makefile.am Makefile.in
event-test.c
src/external/bsd/libevent/dist/test: Makefile.am Makefile.in
src/external/bsd/libevent/include: event-config.h
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libevent/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libevent/dist/Doxyfile \
src/external/bsd/libevent/dist/bufferevent-internal.h \
src/external/bsd/libevent/dist/bufferevent_ratelim.c \
src/external/bsd/libevent/dist/event-internal.h \
src/external/bsd/libevent/dist/evmap.c \
src/external/bsd/libevent/dist/evthread-internal.h \
src/external/bsd/libevent/dist/ht-internal.h \
src/external/bsd/libevent/dist/ltmain.sh \
src/external/bsd/libevent/dist/minheap-internal.h \
src/external/bsd/libevent/dist/ratelim-internal.h \
src/external/bsd/libevent/dist/select.c
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/libevent/dist/README \
src/external/bsd/libevent/dist/evdns.h \
src/external/bsd/libevent/dist/event.h \
src/external/bsd/libevent/dist/evhttp.h \
src/external/bsd/libevent/dist/evrpc.h \
src/external/bsd/libevent/dist/evutil.h
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/libevent/dist/buffer.c \
src/external/bsd/libevent/dist/bufferevent.c \
src/external/bsd/libevent/dist/evbuffer-internal.h \
src/external/bsd/libevent/dist/evdns.c \
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/http.c \
src/external/bsd/libevent/dist/util-internal.h
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/libevent/dist/configure.in
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/libevent/dist/evutil.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/libevent/dist/evutil_rand.c \
src/external/bsd/libevent/dist/log-internal.h \
src/external/bsd/libevent/dist/log.c
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/libevent/dist/WIN32-Code/event2/event-config.h
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/libevent/dist/include/Makefile.am
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/libevent/dist/include/Makefile.in
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/libevent/dist/include/event2/rpc.h \
src/external/bsd/libevent/dist/include/event2/util.h
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/libevent/dist/sample/Makefile.am \
src/external/bsd/libevent/dist/sample/event-test.c
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/libevent/dist/sample/Makefile.in
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/libevent/dist/test/Makefile.am \
src/external/bsd/libevent/dist/test/Makefile.in
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/libevent/dist/test/regress.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/libevent/dist/test/regress.h \
src/external/bsd/libevent/dist/test/regress_buffer.c
cvs rdiff -u -r1.2 -r1.3 \
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_util.c \
src/external/bsd/libevent/dist/test/regress_zlib.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/libevent/dist/test/regress_dns.c \
src/external/bsd/libevent/dist/test/regress_http.c \
src/external/bsd/libevent/dist/test/regress_thread.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/libevent/dist/test/regress_rpc.c \
src/external/bsd/libevent/dist/test/tinytest_macros.h
cvs rdiff -u -r0 -r1.3 src/external/bsd/libevent/include/config.h
cvs rdiff -u -r0 -r1.1 src/external/bsd/libevent/include/evconfig-private.h
cvs rdiff -u -r1.1 -r0 src/external/bsd/libevent/include/event-config.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/libevent/include/event2/event-config.h
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libevent/lib/libevent/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
