Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Constant2019-07-16 12:06:22 +0000
committerOlivier Constant2019-07-16 12:06:22 +0000
commitcd82bef6401c91860c48219f0a243599dc55887b (patch)
tree46d8efb118e10d81cf9490f1873210e074b49369 /tests/org.eclipse.emf.diffmerge.tests.wt.elements/.project
parentcfd2e6802e77f1a2a6b1a66061e8a2994eaa7e71 (diff)
parent363ff1d41ca4bc3ae293209906135f55ab3ddb33 (diff)
downloadorg.eclipse.emf.diffmerge.core-cd82bef6401c91860c48219f0a243599dc55887b.tar.gz
org.eclipse.emf.diffmerge.core-cd82bef6401c91860c48219f0a243599dc55887b.tar.xz
org.eclipse.emf.diffmerge.core-cd82bef6401c91860c48219f0a243599dc55887b.zip
Merge branch '0.11.x'
Conflicts: releng/org.eclipse.emf.diffmerge.tests.ui.product/diffmerge-gui-test.product Change-Id: I9711d30d104f3fb7e63e125e1a7400d6d0b4f246 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
Diffstat (limited to 'tests/org.eclipse.emf.diffmerge.tests.wt.elements/.project')
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.wt.elements/.project56
1 files changed, 28 insertions, 28 deletions
diff --git a/tests/org.eclipse.emf.diffmerge.tests.wt.elements/.project b/tests/org.eclipse.emf.diffmerge.tests.wt.elements/.project
index 2045fe55..4d44e3c2 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.wt.elements/.project
+++ b/tests/org.eclipse.emf.diffmerge.tests.wt.elements/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.emf.diffmerge.tests.wt.elements</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emf.diffmerge.tests.wt.elements</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>

Back to the top