diff options
| author | Kenichi Handa | 2012-09-30 23:39:46 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2012-09-30 23:39:46 +0900 |
| commit | c194970e15b6d6efa07697679a25dfab3aa76442 (patch) | |
| tree | 49aec8be9d2dcc74ad3c81f562e48308d8e27b75 /src/ChangeLog.2 | |
| parent | 95402d5faa114a311cabfb8c64cf22a93787a066 (diff) | |
| parent | dd946752ab8810149a66a3eff469eb128709972d (diff) | |
| download | emacs-c194970e15b6d6efa07697679a25dfab3aa76442.tar.gz emacs-c194970e15b6d6efa07697679a25dfab3aa76442.zip | |
merge trunk
Diffstat (limited to 'src/ChangeLog.2')
| -rw-r--r-- | src/ChangeLog.2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ChangeLog.2 b/src/ChangeLog.2 index 1a9728f6896..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 |