# 更改http测试程序
# 删除win32下当前不使用的文件
# 添加Reactor模式简介文档(txt)
Merge branch 'master' of https://github.com/DayDayUpCQ/libevent32

Conflicts:
	src/http_test/http_test.c