diff options
| -rw-r--r-- | src/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 74931328585..923ba3afafd 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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> |