diff options
| author | Bill Wohler | 2012-11-24 19:43:02 -0800 |
|---|---|---|
| committer | Bill Wohler | 2012-11-24 19:43:02 -0800 |
| commit | 5244bc019bf7376caff3bb198ff674e0ad9fb0e6 (patch) | |
| tree | 02ee1615e904771f692ec2957c79a08ae029a13d /src/ChangeLog.2 | |
| parent | 9f7e719509474e92f85955e22e57ffeebd4e96f3 (diff) | |
| parent | c07a6ded1df2f4156badc9add2953579622c3722 (diff) | |
| download | emacs-5244bc019bf7376caff3bb198ff674e0ad9fb0e6.tar.gz emacs-5244bc019bf7376caff3bb198ff674e0ad9fb0e6.zip | |
Merge from trunk.
Diffstat (limited to 'src/ChangeLog.2')
| -rw-r--r-- | src/ChangeLog.2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ChangeLog.2 b/src/ChangeLog.2 index d3be0064610..0806106836e 100644 --- a/src/ChangeLog.2 +++ b/src/ChangeLog.2 | |||
| @@ -2680,7 +2680,7 @@ | |||
| 2680 | 2680 | ||
| 2681 | 1986-12-11 Richard Mlynarik (mly@prep) | 2681 | 1986-12-11 Richard Mlynarik (mly@prep) |
| 2682 | 2682 | ||
| 2683 | * emacs.c, dispnew.c: | 2683 | * emacs.c, dispnew.c: |
| 2684 | Rename inhibit_x_windows inhibit_window_system. | 2684 | Rename inhibit_x_windows inhibit_window_system. |
| 2685 | Understand "-nw" command-line option. | 2685 | Understand "-nw" command-line option. |
| 2686 | Reorganize init_display a little to make other window-system | 2686 | Reorganize init_display a little to make other window-system |
| @@ -4771,7 +4771,7 @@ | |||
| 4771 | 4771 | ||
| 4772 | See ChangeLog.1 for earlier changes. | 4772 | See ChangeLog.1 for earlier changes. |
| 4773 | 4773 | ||
| 4774 | Copyright (C) 1986-1988, 2001-2011 Free Software Foundation, Inc. | 4774 | Copyright (C) 1986-1988, 2001-2012 Free Software Foundation, Inc. |
| 4775 | 4775 | ||
| 4776 | This file is part of GNU Emacs. | 4776 | This file is part of GNU Emacs. |
| 4777 | 4777 | ||