aboutsummaryrefslogtreecommitdiffstats
path: root/lib-src/emacsclient.c
diff options
context:
space:
mode:
authorPaul Eggert2013-01-02 08:13:04 -0800
committerPaul Eggert2013-01-02 08:13:04 -0800
commit0877d0dc24ee792b9b14592869ea1aa0934aee58 (patch)
tree08e9265a1dd95974dc72622a9bef194682c0c716 /lib-src/emacsclient.c
parentaca3d51dfa45794fa68a2ffb6269e34fcee2ec6c (diff)
parentd8fb8cce84b923a3289b69549e30958710ac3ebb (diff)
downloademacs-0877d0dc24ee792b9b14592869ea1aa0934aee58.tar.gz
emacs-0877d0dc24ee792b9b14592869ea1aa0934aee58.zip
Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca
Diffstat (limited to 'lib-src/emacsclient.c')
-rw-r--r--lib-src/emacsclient.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 021ac6eb247..6feaf18ba60 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -1,6 +1,6 @@
1/* Client process that communicates with GNU Emacs acting as server. 1/* Client process that communicates with GNU Emacs acting as server.
2 2
3Copyright (C) 1986-1987, 1994, 1999-2012 Free Software Foundation, Inc. 3Copyright (C) 1986-1987, 1994, 1999-2013 Free Software Foundation, Inc.
4 4
5This file is part of GNU Emacs. 5This file is part of GNU Emacs.
6 6