From: Lee <ler762@users.sourceforge.net>
Date: Wed, 2 Sep 2020 19:18:03 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.privoxy.org:23/git/privoxy
X-Git-Tag: v_3_0_30~275
X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=6235cc02e3f789fd39b1d72fadeb776ec3920572;hp=c62254a686dcd40e3b6e5753d0c7c0308209a7b6

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/