Index: stable/10/contrib/libucl/tests/.gitignore
===================================================================
--- stable/10/contrib/libucl/tests/.gitignore	(revision 295491)
+++ stable/10/contrib/libucl/tests/.gitignore	(nonexistent)
@@ -1,8 +0,0 @@
-*.log
-*.trs
-*.plist
-
-test_basic
-test_generate
-test_schema
-test_speed
Index: stable/10/contrib/unbound/.gitignore
===================================================================
--- stable/10/contrib/unbound/.gitignore	(revision 295491)
+++ stable/10/contrib/unbound/.gitignore	(nonexistent)
@@ -1,38 +0,0 @@
-*.lo
-*.o
-/.libs/
-/Makefile
-/autom4te.cache/
-/config.h
-/config.log
-/config.status
-/dnstap/dnstap_config.h
-/doc/example.conf
-/doc/libunbound.3
-/doc/unbound-anchor.8
-/doc/unbound-checkconf.8
-/doc/unbound-control.8
-/doc/unbound-host.1
-/doc/unbound.8
-/doc/unbound.conf.5
-/libtool
-/libunbound.la
-/smallapp/unbound-control-setup.sh
-/unbound
-/unbound-anchor
-/unbound-checkconf
-/unbound-control
-/unbound-control-setup
-/unbound-host
-/unbound.h
-/asynclook
-/delayer
-/lock-verify
-/memstats
-/perf
-/petal
-/pktview
-/streamtcp
-/testbound
-/unittest
-
Index: stable/10
===================================================================
--- stable/10	(revision 295491)
+++ stable/10	(revision 295492)

Property changes on: stable/10
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r295159