diff options
Diffstat (limited to 'src')
| -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 @@ | |||
| 32 | 32 | ||
| 33 | * process.c (add_keyboard_wait_descriptor) [!subprocesses]: Ifdef | 33 | * process.c (add_keyboard_wait_descriptor) [!subprocesses]: Ifdef |
| 34 | away the entire body of the function. | 34 | away the entire body of the function. |
| 35 | >>>>>>> MERGE-SOURCE | ||
| 36 | 35 | ||
| 37 | 2010-07-13 Dan Nicolaescu <dann@ics.uci.edu> | 36 | 2010-07-13 Dan Nicolaescu <dann@ics.uci.edu> |
| 38 | 37 | ||