From: Lee <ler762@users.sourceforge.net>
Date: Tue, 2 Jun 2020 04:35:17 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.privoxy.org:23/git/privoxy
X-Git-Tag: v_3_0_30~281
X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=540249459558fe9ae78dcaba162c362ba5263530;hp=654e888213971b44851ed89a0bc5a302b87fde48

Merge branch 'master' of ssh://git.privoxy.org:23/git/privoxy
---

diff --git a/.gitignore b/.gitignore
index 81750a05..2f41ae85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,3 +57,4 @@ w32.res
 .project
 autom4te.cache
 default.action
+windows/build/