Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca

This commit is contained in:
Paul Eggert 2013-01-02 08:13:04 -08:00
commit 0877d0dc24
2237 changed files with 2783 additions and 2620 deletions

View file

@ -1,6 +1,6 @@
/* Client process that communicates with GNU Emacs acting as server.
Copyright (C) 1986-1987, 1994, 1999-2012 Free Software Foundation, Inc.
Copyright (C) 1986-1987, 1994, 1999-2013 Free Software Foundation, Inc.
This file is part of GNU Emacs.