summaryrefslogtreecommitdiff
path: root/nt
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2016-01-11 22:48:10 -0800
committerJohn Wiegley <johnw@newartisans.com>2016-01-11 22:48:10 -0800
commita8dd976aa5299060ee3670f8d693887960aa6ad8 (patch)
treec805ea51cdf387c43e9aa2a99c502e7e44810418 /nt
parent91b263e76f5ce170c1c8cbc34a2e7614c32612b8 (diff)
parent9fb185aff7b1f36c30bd157ec446d9bad104d1ee (diff)
downloademacs-a8dd976aa5299060ee3670f8d693887960aa6ad8.tar.gz
Merge from origin/emacs-25
9fb185a shr-tag-video bug fix 6300655 Minor fixes in tramp-tests.el 50575b1 Ensure redisplay when 'truncate-lines' is set 0d9e80d Fix a doc string of 'transient-mark-mode' 0000ae5 MS-Windows followup to latest gnulib update 4bc5e02 Spelling fix f1093f7 Do secure signed Bcc handling
Diffstat (limited to 'nt')
-rw-r--r--nt/gnulib.mk7
1 files changed, 7 insertions, 0 deletions
diff --git a/nt/gnulib.mk b/nt/gnulib.mk
index 7c9cc199468..6884bf9f077 100644
--- a/nt/gnulib.mk
+++ b/nt/gnulib.mk
@@ -453,6 +453,13 @@ EXTRA_libgnu_a_SOURCES += group-member.c
## end gnulib module group-member
+## begin gnulib module ignore-value
+
+
+EXTRA_DIST += ignore-value.h
+
+## end gnulib module ignore-value
+
## begin gnulib module intprops