Merge from origin/emacs-24

[gnu-emacs] / nt / cmdproxy.c

diff --git a/nt/cmdproxy.c b/nt/cmdproxy.c
index d8f7ae3c41e9ebcaab5b2875980d010c07a9f331..faef2f83496b6dc6cff9f95a39a4d1bbd653e78a 100644 (file)
--- a/nt/cmdproxy.c
+++ b/nt/cmdproxy.c
@@ -1,5 +1,5 @@
 /* Proxy shell designed for use with Emacs on Windows 95 and NT.
-   Copyright (C) 1997, 2001-2014 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2001-2015 Free Software Foundation, Inc.
 
    Accepts subset of Unix sh(1) command-line options, for compatibility
    with elisp code written for Unix.  When possible, executes external