diff options
| author | Matthias Sohn | 2011-12-26 22:52:32 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2011-12-26 22:52:32 +0000 |
| commit | 067ccbfda7b1dd804341addff398b1d8720edc63 (patch) | |
| tree | 78b8bad2e636317d6d165c7bede473dd0ffde3de /org.eclipse.jgit.junit.http/.project | |
| parent | 64a3bf1dcba32a20813ddccfffe093919ed9b23e (diff) | |
| parent | a069e90fa9ab0262df471797e9b77505a3396f23 (diff) | |
| download | jgit-067ccbfda7b1dd804341addff398b1d8720edc63.tar.gz jgit-067ccbfda7b1dd804341addff398b1d8720edc63.tar.xz jgit-067ccbfda7b1dd804341addff398b1d8720edc63.zip | |
Merge branch 'stable-1.2'
* stable-1.2:
JGit v1.2.0.201112221803-r
Expose unmerged paths when revert fails
Enforce the use of Java5 API:s only (with a few exceptions)
Change-Id: Ib18d41a65e68cc47fb63114fcce27a16820d0692
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.junit.http/.project')
| -rw-r--r-- | org.eclipse.jgit.junit.http/.project | 62 |
1 files changed, 34 insertions, 28 deletions
diff --git a/org.eclipse.jgit.junit.http/.project b/org.eclipse.jgit.junit.http/.project index 0a38e4ab93..2de2238389 100644 --- a/org.eclipse.jgit.junit.http/.project +++ b/org.eclipse.jgit.junit.http/.project @@ -1,28 +1,34 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jgit.junit.http</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.jgit.junit.http</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> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + </natures> +</projectDescription> |