aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/java/lang/Process.java4
2 files changed, 7 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 5d2d047..4241a71 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,10 @@
2003-03-19 Michael Koch <konqueror@gmx.de>
+ * java/lang/Process.java:
+ Merged from classpath.
+
+2003-03-19 Michael Koch <konqueror@gmx.de>
+
* java/io/FileOutputStream.java
(FileOutputStream): New constructor, merged from classpath.
* java/io/FileWriter.java
diff --git a/libjava/java/lang/Process.java b/libjava/java/lang/Process.java
index e5df417..1d1861d 100644
--- a/libjava/java/lang/Process.java
+++ b/libjava/java/lang/Process.java
@@ -1,5 +1,5 @@
/* Process.java - Represent spawned system process
- Copyright (C) 1998, 1999, 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2001, 2002, 2003 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -107,7 +107,7 @@ public abstract class Process
* immediately returns with the exit value of the subprocess.
*
* @return the subprocess exit value; 0 conventionally denotes success
- * @throws InterruptedException if another thread interrups the blocked one
+ * @throws InterruptedException if another thread interrupts the blocked one
*/
public abstract int waitFor() throws InterruptedException;