diff options
| author | Andrew Niefer <aniefer@ca.ibm.com> | 2011-04-26 13:36:31 -0400 |
|---|---|---|
| committer | Andrew Niefer <aniefer@ca.ibm.com> | 2011-04-26 13:36:31 -0400 |
| commit | 9470e0c0b08364d81217e0a3dbfe0f85f3accb94 (patch) | |
| tree | 3a4c5d1613d7c2385b6d587018dd5531de8db6dc | |
| parent | 9f7cc9ebee1910853f4254ef05b4c14046239cd7 (diff) | |
| parent | f3be726b6348e1666c1227e59925fc18a707673f (diff) | |
| download | org.eclipse.orion.client-origin/dojo_160.zip org.eclipse.orion.client-origin/dojo_160.tar.gz org.eclipse.orion.client-origin/dojo_160.tar.bz2 | |
Merge branch 'master' into dojo_160v20110426-1337origin/dojo_160
| -rw-r--r-- | bundles/org.eclipse.orion.client.core/static/js/coding/coding.js | 8 | ||||
| -rw-r--r-- | bundles/org.eclipse.orion.client.core/static/js/compare/demo/demo-data.js | 7 |
2 files changed, 8 insertions, 7 deletions
diff --git a/bundles/org.eclipse.orion.client.core/static/js/coding/coding.js b/bundles/org.eclipse.orion.client.core/static/js/coding/coding.js index e2be8ac..193722f 100644 --- a/bundles/org.eclipse.orion.client.core/static/js/coding/coding.js +++ b/bundles/org.eclipse.orion.client.core/static/js/coding/coding.js @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2010, 2011 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 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * All rights reserved. This program and the accompanying materials are made + * available under the terms of the Eclipse Public License v1.0 + * (http://www.eclipse.org/legal/epl-v10.html), and the Eclipse Distribution + * License v1.0 (http://www.eclipse.org/org/documents/edl-v10.html). * * Contributors: * IBM Corporation - initial API and implementation diff --git a/bundles/org.eclipse.orion.client.core/static/js/compare/demo/demo-data.js b/bundles/org.eclipse.orion.client.core/static/js/compare/demo/demo-data.js index 6d55e09..7018942 100644 --- a/bundles/org.eclipse.orion.client.core/static/js/compare/demo/demo-data.js +++ b/bundles/org.eclipse.orion.client.core/static/js/compare/demo/demo-data.js @@ -1,8 +1,9 @@ /*******************************************************************************
* Copyright (c) 2011 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 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License v1.0
+ * (http://www.eclipse.org/legal/epl-v10.html), and the Eclipse Distribution
+ * License v1.0 (http://www.eclipse.org/org/documents/edl-v10.html).
*
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
|