diff options
Diffstat (limited to 'udkapi/com/sun/star/registry/MergeConflictException.idl')
| -rw-r--r-- | udkapi/com/sun/star/registry/MergeConflictException.idl | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/udkapi/com/sun/star/registry/MergeConflictException.idl b/udkapi/com/sun/star/registry/MergeConflictException.idl index 385f639b14c5..b9879e49cbc7 100644 --- a/udkapi/com/sun/star/registry/MergeConflictException.idl +++ b/udkapi/com/sun/star/registry/MergeConflictException.idl @@ -2,9 +2,9 @@ * * $RCSfile: MergeConflictException.idl,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: mi $ $Date: 2002-12-11 13:29:52 $ + * last change: $Author: mi $ $Date: 2003-01-21 13:17:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -86,5 +86,25 @@ exception MergeConflictException: com::sun::star::uno::Exception /*============================================================================= + $Log: not supported by cvs2svn $ + Revision 1.5 2002/10/03 12:44:08 mi + #94968# IDL reviews merged + + Revision 1.4.24.1 2002/03/26 14:24:17 jsc + #98365# reviewed + + Revision 1.4 2000/11/08 12:28:50 mi + moved from api + + Revision 1.1.1.1 2000/09/18 23:35:32 hjs + initial import + + Revision 1.3 2000/09/11 11:52:37 mi + documentation merged from XML + + Revision 1.1.1.1 1999/11/11 09:48:44 jsc + new + + =============================================================================*/ #endif |