diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2013-03-28 20:13:59 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2013-03-28 20:13:59 +0200 |
| commit | d76bf86f438d4f5f9fe493ab76f02ffc78f3ae2e (patch) | |
| tree | 04fa8bc7bd2058a316a7ee30f8741d25bfd0b060 /nt/inc/sys/socket.h | |
| parent | 2ef26ceb192c7683754cf0b4aa3087f501254332 (diff) | |
| parent | e74aeda863cd6896e06e92586f87b45d63d67d15 (diff) | |
| download | emacs-d76bf86f438d4f5f9fe493ab76f02ffc78f3ae2e.tar.gz | |
Merge from trunk and resolve conflicts.
Diffstat (limited to 'nt/inc/sys/socket.h')
| -rw-r--r-- | nt/inc/sys/socket.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nt/inc/sys/socket.h b/nt/inc/sys/socket.h index 1c8be6c452f..99227d75d28 100644 --- a/nt/inc/sys/socket.h +++ b/nt/inc/sys/socket.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 2001-2012 Free Software Foundation, Inc. +/* Copyright (C) 1995, 2001-2013 Free Software Foundation, Inc. This file is part of GNU Emacs. |