From 1460904fd3c193ffaf809913b2983a400fce9d94 Mon Sep 17 00:00:00 2001
From: Eike Stepper
Date: Thu, 19 Jul 2012 10:22:04 +0200
Subject: Fix line endings in master (dos2unix)

---
 .../.settings/org.eclipse.mylyn.tasks.ui.prefs     |   8 +-
 .../build.properties                               |  26 +++---
 .../feature.xml                                    | 102 ++++++++++-----------
 3 files changed, 68 insertions(+), 68 deletions(-)

(limited to 'features/org.eclipse.emf.cdo.server.objectivity-feature')

diff --git a/features/org.eclipse.emf.cdo.server.objectivity-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs b/features/org.eclipse.emf.cdo.server.objectivity-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
index fcd586de24..fb8106e546 100644
--- a/features/org.eclipse.emf.cdo.server.objectivity-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ b/features/org.eclipse.emf.cdo.server.objectivity-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs
@@ -1,4 +1,4 @@
-#Mon Jul 04 12:33:36 CEST 2011
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
+#Mon Jul 04 12:33:36 CEST 2011
+eclipse.preferences.version=1
+project.repository.kind=bugzilla
+project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/features/org.eclipse.emf.cdo.server.objectivity-feature/build.properties b/features/org.eclipse.emf.cdo.server.objectivity-feature/build.properties
index f63c2e79d1..702432df1e 100644
--- a/features/org.eclipse.emf.cdo.server.objectivity-feature/build.properties
+++ b/features/org.eclipse.emf.cdo.server.objectivity-feature/build.properties
@@ -1,13 +1,13 @@
-# Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) 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
-#
-# Contributors:
-#    Eike Stepper - initial API and implementation
-
-# NLS_MESSAGEFORMAT_VAR
-
-bin.includes = feature.xml,\
-               feature.properties
+# Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) 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
+#
+# Contributors:
+#    Eike Stepper - initial API and implementation
+
+# NLS_MESSAGEFORMAT_VAR
+
+bin.includes = feature.xml,\
+               feature.properties
diff --git a/features/org.eclipse.emf.cdo.server.objectivity-feature/feature.xml b/features/org.eclipse.emf.cdo.server.objectivity-feature/feature.xml
index 57767a78cf..d792c947bf 100644
--- a/features/org.eclipse.emf.cdo.server.objectivity-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.server.objectivity-feature/feature.xml
@@ -1,51 +1,51 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) 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
-
-	Contributors:
-	  Simon McDuff - initial API and implementation
-	  Ibrahim Sallam - Code refactring and CDO 3.0 support
--->
-<feature
-      id="org.eclipse.emf.cdo.server.objectivity"
-      label="%featureName"
-      version="4.1.0.qualifier"
-      provider-name="%providerName"
-      image="eclipse_update_120.jpg" license-feature="org.eclipse.emf.cdo.license" license-feature-version="4.1.0.qualifier">
-
-   <description>
-      %description
-   </description>
-
-   <copyright url="%copyrightURL">
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
-      <discovery label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
-   </url>
-
-   <plugin
-         id="org.eclipse.emf.cdo.server.objectivity"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.emf.cdo.server.objectivity.stub"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) 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
+
+	Contributors:
+	  Simon McDuff - initial API and implementation
+	  Ibrahim Sallam - Code refactring and CDO 3.0 support
+-->
+<feature
+      id="org.eclipse.emf.cdo.server.objectivity"
+      label="%featureName"
+      version="4.1.0.qualifier"
+      provider-name="%providerName"
+      image="eclipse_update_120.jpg" license-feature="org.eclipse.emf.cdo.license" license-feature-version="4.1.0.qualifier">
+
+   <description>
+      %description
+   </description>
+
+   <copyright url="%copyrightURL">
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <url>
+      <update label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
+      <discovery label="%updateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
+   </url>
+
+   <plugin
+         id="org.eclipse.emf.cdo.server.objectivity"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.emf.cdo.server.objectivity.stub"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
-- 
cgit v1.2.3