diff options
| author | Stephan Herrmann | 2013-12-28 14:09:46 +0000 |
|---|---|---|
| committer | Stephan Herrmann | 2013-12-28 20:26:11 +0000 |
| commit | 5d83a98aac93458ef8065e54614bd1ba2547eb11 (patch) | |
| tree | a654ad69b1753c0b672ae21260382c35ae4e9601 /releng/map/otdt.map.in | |
| parent | 112a9fe43fb0bc631ec7353a80d49a73f014db58 (diff) | |
| parent | 7698613f7c36563430f70040457a7601e3bc9955 (diff) | |
| download | org.eclipse.objectteams-5d83a98aac93458ef8065e54614bd1ba2547eb11.tar.gz org.eclipse.objectteams-5d83a98aac93458ef8065e54614bd1ba2547eb11.tar.xz org.eclipse.objectteams-5d83a98aac93458ef8065e54614bd1ba2547eb11.zip | |
Merge commit '7698613f7c36563430f70040457a7601e3bc9955' into
OT_BETA_JAVA8
Conflicts:
org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/MethodVerifier.java
org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/MethodVerifier15.java
releng/build-scripts/build/otdt_prerequisites.sh
releng/map/otdt.map.in
Diffstat (limited to 'releng/map/otdt.map.in')
| -rw-r--r-- | releng/map/otdt.map.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/releng/map/otdt.map.in b/releng/map/otdt.map.in index 60e1072b7..e1af0279b 100644 --- a/releng/map/otdt.map.in +++ b/releng/map/otdt.map.in @@ -29,7 +29,7 @@ plugin@org.eclipse.objectteams.eclipse.monitor,2.0.0=GIT,repo=git://git.eclipse. !plugin@org.eclipse.objectteams.otdt.earlyui=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.earlyui
!plugin@org.eclipse.objectteams.otdt.metrics.export=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.metrics.export
-!** OT/J Plugins **!
+!** OT/J Plugins **! plugin@org.eclipse.objectteams.otequinox.branding,2.2.0=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otequinox.branding,tag=OT_BETA_JAVA8
plugin@org.eclipse.objectteams.otdt.jdt.ui,2.2.0=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.jdt.ui,tag=OT_BETA_JAVA8
plugin@org.eclipse.objectteams.otdt.ui.help,2.2.0=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otdt.ui.help,tag=OT_BETA_JAVA8
|