Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Michel-Lemieux2004-06-23 16:07:01 +0000
committerJean Michel-Lemieux2004-06-23 16:07:01 +0000
commit4f5240c69c85865edb97c52f653fb0681fc34302 (patch)
treeed10fc21ad6b42e67ac3aed07560448a909e2ac6 /bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeUpdateAction.java
parent0178d7559e1ac8924a8a111453ffc8fe6c171ab6 (diff)
downloadeclipse.platform.team-4f5240c69c85865edb97c52f653fb0681fc34302.tar.gz
eclipse.platform.team-4f5240c69c85865edb97c52f653fb0681fc34302.tar.xz
eclipse.platform.team-4f5240c69c85865edb97c52f653fb0681fc34302.zip
Copyright updates for 3.0
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeUpdateAction.java')
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeUpdateAction.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeUpdateAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeUpdateAction.java
index 2a1cd7045..d844a77c6 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeUpdateAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeUpdateAction.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * Copyright (c) 2000, 2004 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Common Public License v1.0
* which accompanies this distribution, and is available at
@@ -53,4 +53,4 @@ public class MergeUpdateAction extends CVSParticipantAction {
public void setPromptBeforeUpdate(boolean prompt) {
promptBeforeUpdate = prompt;
}
-} \ No newline at end of file
+}

Back to the top