diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-08-18 10:14:29 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-08-18 10:14:29 -0400 |
| commit | 571295bdf89bc9d73e1b0720140d9615fa0a304c (patch) | |
| tree | 431665bab179173a2cb71dc045d47dfad7523b87 | |
| parent | 6ec949265a11cb31432ced22407fb1bd803c9317 (diff) | |
| parent | 1a8295a31671b4440b170e7fa7d3241c5563311e (diff) | |
| download | libevent-571295bdf89bc9d73e1b0720140d9615fa0a304c.tar.gz | |
Merge remote-tracking branch 'origin/patches-2.0'
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -41,6 +41,8 @@ TAGS libevent.pc libevent_pthreads.pc libevent_openssl.pc +*.log +*.trs ## The initial / makes these files only get ignored in particular directories. /autom4te.cache @@ -97,6 +99,7 @@ libevent_openssl.pc /test/test-closed /test/test-init /test/test-ratelim +/test/test-script.sh /test/test-time /test/test-weof /test/test-changelist |