From: Lee <ler762@users.sourceforge.net>
Date: Sun, 26 Jul 2020 15:34:30 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.privoxy.org:23/git/privoxy
X-Git-Tag: v_3_0_30~277
X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=c1c254de39540a55a837a6ab24b6a4ce22fc7fa2;hp=41669199aef64461ba14d955bff9f34a8e7555aa

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/