aboutsummaryrefslogtreecommitdiffstats
path: root/src/process.c
diff options
context:
space:
mode:
authorPaul Eggert2011-01-14 10:14:17 -0800
committerPaul Eggert2011-01-14 10:14:17 -0800
commit8a1f4a98c1b8e3abaf1b46394a88d09531ce4c2d (patch)
tree9aed5489fdfdcf75087bf3d8e50e4f5952c8566c /src/process.c
parent3720fa2b1ac94b8ac9f193264bcf36990a5f43d2 (diff)
parentf80aa5bfa90dff5cd75d1f40e4ababa3c86af7fb (diff)
downloademacs-8a1f4a98c1b8e3abaf1b46394a88d09531ce4c2d.tar.gz
emacs-8a1f4a98c1b8e3abaf1b46394a88d09531ce4c2d.zip
Merge from mainline.
Diffstat (limited to 'src/process.c')
-rw-r--r--src/process.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/process.c b/src/process.c
index 8f9d935e08f..0c8d0cab6d0 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1,7 +1,7 @@
1/* Asynchronous subprocess control for GNU Emacs. 1/* Asynchronous subprocess control for GNU Emacs.
2 Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 2 Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995,
3 1996, 1998, 1999, 2001, 2002, 2003, 2004, 3 1996, 1998, 1999, 2001, 2002, 2003, 2004,
4 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. 4 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
5 5
6This file is part of GNU Emacs. 6This file is part of GNU Emacs.
7 7