[Jcommander-commit] plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/merge TextStreamMerger.java,1.1,1.2 MergeMessages.properties,1.1,1.2 LineComparator.java,1.1,1.2

[Matthias K <mat...@us...>]

Update of /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/merge
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13295/compare/org/eclipse/compare/internal/merge

Modified Files:
	TextStreamMerger.java MergeMessages.properties 
	LineComparator.java 
Log Message:
Updated to Eclipse 3.2 M6

Index: MergeMessages.properties
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/merge/MergeMessages.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MergeMessages.properties	28 Mar 2006 13:49:16 -0000	1.1
--- MergeMessages.properties	5 Apr 2006 16:12:49 -0000	1.2
***************
*** 1,4 ****
  ###############################################################################
! # Copyright (c) 2004 IBM Corporation and others.
  # All rights reserved. This program and the accompanying materials
  # are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  ###############################################################################
! # Copyright (c) 2004, 2005 IBM Corporation and others.
  # All rights reserved. This program and the accompanying materials
  # are made available under the terms of the Eclipse Public License v1.0

Index: TextStreamMerger.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/merge/TextStreamMerger.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TextStreamMerger.java	28 Mar 2006 13:49:16 -0000	1.1
--- TextStreamMerger.java	5 Apr 2006 16:12:49 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2003, 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2003, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0

Index: LineComparator.java
===================================================================
RCS file: /cvsroot/jcommander/plugins/org.jcommander.eclipsepatch.compare/compare/org/eclipse/compare/internal/merge/LineComparator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LineComparator.java	28 Mar 2006 13:49:16 -0000	1.1
--- LineComparator.java	5 Apr 2006 16:12:49 -0000	1.2
***************
*** 1,4 ****
  /*******************************************************************************
!  * Copyright (c) 2004 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0
--- 1,4 ----
  /*******************************************************************************
!  * Copyright (c) 2004, 2005 IBM Corporation and others.
   * All rights reserved. This program and the accompanying materials
   * are made available under the terms of the Eclipse Public License v1.0