mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-13 09:32:47 +00:00
Code Issues Releases Activity

Fix previous conflict.

Browse Source
This commit is contained in:
Kenichi Handa 2010-07-14 12:53:53 +09:00
parent 73a4405a35
commit ebd3d6afa4
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ChangeLog
View File

@ -32,7 +32,6 @@
* process.c (add_keyboard_wait_descriptor) [!subprocesses]: Ifdef
away the entire body of the function.
>>>>>>> MERGE-SOURCE
2010-07-13 Dan Nicolaescu <dann@ics.uci.edu>