diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-08-17 22:08:06 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-08-17 22:08:06 -0400 |
| commit | ec670c15a7d7c41866edf45faf98448852257a4b (patch) | |
| tree | b9e02cea0b8ad3117139dc861c6d93e2f55d8bd9 /.gitignore | |
| parent | 3c63edd1f7ea1e26937466cf3ad16b7bf0e265e4 (diff) | |
| parent | 04656ea85a1b6ec0fbe1fa126f8c81e9b17abab5 (diff) | |
| download | libevent-ec670c15a7d7c41866edf45faf98448852257a4b.tar.gz | |
Merge remote-tracking branch 'origin/patches-2.0'
Conflict in buffer.c: the new file-segment logic conflicted with the
solaris sendfile fix.
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -87,6 +87,7 @@ libevent_openssl.pc /test/regress /test/regress.gen.c /test/regress.gen.h +/test/rpcgen-attempted /test/test-eof /test/test-init /test/test-ratelim |