aboutsummaryrefslogtreecommitdiffstats
path: root/src/blockinput.h
diff options
context:
space:
mode:
authorjave2015-01-02 16:30:55 +0100
committerjave2015-01-02 16:30:55 +0100
commitdb4613576d3115aa320f0293d081ce98baa06acd (patch)
tree829968643b451bd3f64c791e4d3a6c928010e14c /src/blockinput.h
parentc089503bac34376e75ae6f1d2c289fc8c9f42b8f (diff)
parentd0ca1148fe2d1e72e86f0197731071f139c143e3 (diff)
downloademacs-db4613576d3115aa320f0293d081ce98baa06acd.tar.gz
emacs-db4613576d3115aa320f0293d081ce98baa06acd.zip
merge master
Diffstat (limited to 'src/blockinput.h')
-rw-r--r--src/blockinput.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/blockinput.h b/src/blockinput.h
index 8303c8c4d36..b0dbdf22885 100644
--- a/src/blockinput.h
+++ b/src/blockinput.h
@@ -1,5 +1,5 @@
1/* blockinput.h - interface to blocking complicated interrupt-driven input. 1/* blockinput.h - interface to blocking complicated interrupt-driven input.
2 Copyright (C) 1989, 1993, 2001-2014 Free Software Foundation, Inc. 2 Copyright (C) 1989, 1993, 2001-2015 Free Software Foundation, Inc.
3 3
4This file is part of GNU Emacs. 4This file is part of GNU Emacs.
5 5