From 2d8cf20d0d5ca6b1fbdefc22229d4b7cf1497ede Mon Sep 17 00:00:00 2001 From: mark Date: Tue, 17 Jan 2006 18:09:40 +0000 Subject: Imported GNU Classpath 0.20 * Makefile.am (AM_CPPFLAGS): Add classpath/include. * java/nio/charset/spi/CharsetProvider.java: New override file. * java/security/Security.java: Likewise. * sources.am: Regenerated. * Makefile.in: Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@109831 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/classpath/org/omg/CORBA/INVALID_ACTIVITY.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libjava/classpath/org/omg/CORBA') diff --git a/libjava/classpath/org/omg/CORBA/INVALID_ACTIVITY.java b/libjava/classpath/org/omg/CORBA/INVALID_ACTIVITY.java index a6e60d02ad4..ae1d92dd7b5 100644 --- a/libjava/classpath/org/omg/CORBA/INVALID_ACTIVITY.java +++ b/libjava/classpath/org/omg/CORBA/INVALID_ACTIVITY.java @@ -43,7 +43,7 @@ import java.io.Serializable; /** * Raised when the transaction or Activity is resumed in a different context * than from which it was suspended. It is also raised when the invocation is - * not incompatible with the Activity’s current state. + * not incompatible with the Activity's current state. * * @since 1.5 * -- cgit v1.2.3