aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog.6
diff options
context:
space:
mode:
authorJoakim Verona2011-11-22 15:39:42 +0100
committerJoakim Verona2011-11-22 15:39:42 +0100
commit40bb789236e486a3f36eefb2840c293369ce2af3 (patch)
tree8e81d3aa5f232ec7f2c5187c683cb0998d2dc4e2 /src/ChangeLog.6
parent62318aed495a48e24ff73fe79e420dd801df3189 (diff)
parenta8e1496d750ab0f571b3412ff61aaa4da640a036 (diff)
downloademacs-40bb789236e486a3f36eefb2840c293369ce2af3.tar.gz
emacs-40bb789236e486a3f36eefb2840c293369ce2af3.zip
upstream
Diffstat (limited to 'src/ChangeLog.6')
-rw-r--r--src/ChangeLog.62
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ChangeLog.6 b/src/ChangeLog.6
index f9372aa666a..141a570040c 100644
--- a/src/ChangeLog.6
+++ b/src/ChangeLog.6
@@ -1138,7 +1138,7 @@
1138 ntproc.c and simplified to match other changes (all handles are 1138 ntproc.c and simplified to match other changes (all handles are
1139 already non-inheritable). 1139 already non-inheritable).
1140 1140
1141 (get_emacs_configuration): Detect Windows flavour (Windows 95 or 1141 (get_emacs_configuration): Detect Windows flavor (Windows 95 or
1142 NT) at run-time. Change OS name for Windows 95 to be "win95". 1142 NT) at run-time. Change OS name for Windows 95 to be "win95".
1143 1143
1144 (fd_info): New variable. Array of extra info for file descriptors 1144 (fd_info): New variable. Array of extra info for file descriptors