diff options
| author | lgoubet | 2012-06-01 14:13:07 +0000 |
|---|---|---|
| committer | lgoubet | 2012-06-01 14:27:38 +0000 |
| commit | d2aaf203678a693848c3ba35728c662578ca1e6b (patch) | |
| tree | c55f1d108ad94c5c0eb9ee6b7cf93643d04cecd7 /plugins/org.eclipse.emf.compare.tests/.settings | |
| parent | a7ca278f3d0cf82599a7aa2d19761299fede027a (diff) | |
| download | org.eclipse.emf.compare-d2aaf203678a693848c3ba35728c662578ca1e6b.tar.gz org.eclipse.emf.compare-d2aaf203678a693848c3ba35728c662578ca1e6b.tar.xz org.eclipse.emf.compare-d2aaf203678a693848c3ba35728c662578ca1e6b.zip | |
Acting the change to CRLF since all projects' settings set this as the file delimiter.
Adding the necessary logic to determine the insertion index when merging reference and attribute values.
Diffstat (limited to 'plugins/org.eclipse.emf.compare.tests/.settings')
| -rw-r--r-- | plugins/org.eclipse.emf.compare.tests/.settings/org.eclipse.core.resources.prefs | 4 | ||||
| -rw-r--r-- | plugins/org.eclipse.emf.compare.tests/.settings/org.eclipse.core.runtime.prefs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/plugins/org.eclipse.emf.compare.tests/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.compare.tests/.settings/org.eclipse.core.resources.prefs index 99f26c020..4824b8026 100644 --- a/plugins/org.eclipse.emf.compare.tests/.settings/org.eclipse.core.resources.prefs +++ b/plugins/org.eclipse.emf.compare.tests/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -encoding/<project>=UTF-8 +eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.eclipse.emf.compare.tests/.settings/org.eclipse.core.runtime.prefs b/plugins/org.eclipse.emf.compare.tests/.settings/org.eclipse.core.runtime.prefs index deae05a97..f8a67de1d 100644 --- a/plugins/org.eclipse.emf.compare.tests/.settings/org.eclipse.core.runtime.prefs +++ b/plugins/org.eclipse.emf.compare.tests/.settings/org.eclipse.core.runtime.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1 -line.separator=\r\n +eclipse.preferences.version=1
+line.separator=\r\n
|