diff options
| author | Eli Zaretskii | 2013-03-28 20:13:59 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2013-03-28 20:13:59 +0200 |
| commit | d76bf86f438d4f5f9fe493ab76f02ffc78f3ae2e (patch) | |
| tree | 04fa8bc7bd2058a316a7ee30f8741d25bfd0b060 /nt/cmdproxy.c | |
| parent | 2ef26ceb192c7683754cf0b4aa3087f501254332 (diff) | |
| parent | e74aeda863cd6896e06e92586f87b45d63d67d15 (diff) | |
| download | emacs-d76bf86f438d4f5f9fe493ab76f02ffc78f3ae2e.tar.gz emacs-d76bf86f438d4f5f9fe493ab76f02ffc78f3ae2e.zip | |
Merge from trunk and resolve conflicts.
Diffstat (limited to 'nt/cmdproxy.c')
| -rw-r--r-- | nt/cmdproxy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nt/cmdproxy.c b/nt/cmdproxy.c index 7c522440072..7d810e3365c 100644 --- a/nt/cmdproxy.c +++ b/nt/cmdproxy.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* Proxy shell designed for use with Emacs on Windows 95 and NT. | 1 | /* Proxy shell designed for use with Emacs on Windows 95 and NT. |
| 2 | Copyright (C) 1997, 2001-2012 Free Software Foundation, Inc. | 2 | Copyright (C) 1997, 2001-2013 Free Software Foundation, Inc. |
| 3 | 3 | ||
| 4 | Accepts subset of Unix sh(1) command-line options, for compatibility | 4 | Accepts subset of Unix sh(1) command-line options, for compatibility |
| 5 | with elisp code written for Unix. When possible, executes external | 5 | with elisp code written for Unix. When possible, executes external |