Skip to content

Commit f7af380

Browse files
committed
Merge pull request #1 from knime-ip/1.0.1
1.0.1
2 parents b8e83e7 + d88dc12 commit f7af380

63 files changed

Lines changed: 126 additions & 183 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

org.knime.knip.imagej3d.base/.classpath

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
44
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
55
<classpathentry kind="src" path="src"/>
66
<classpathentry exported="true" kind="lib" path="lib/ij3d_knip_build.jar"/>

org.knime.knip.imagej3d.base/.settings/org.eclipse.jdt.core.prefs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
66
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
77
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
88
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
9-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
9+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
1010
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
11-
org.eclipse.jdt.core.compiler.compliance=1.6
11+
org.eclipse.jdt.core.compiler.compliance=1.7
1212
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
1313
org.eclipse.jdt.core.compiler.debug.localVariable=generate
1414
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -96,4 +96,4 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
9696
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
9797
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
9898
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
99-
org.eclipse.jdt.core.compiler.source=1.6
99+
org.eclipse.jdt.core.compiler.source=1.7

org.knime.knip.imagej3d.base/META-INF/MANIFEST.MF

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
22
Bundle-Name: KNIME ImageJ 3D Viewer Integration
33
Bundle-SymbolicName: org.knime.knip.imagej3d.base;singleton:=true
44
Bundle-ManifestVersion: 2
5-
Bundle-Version: 1.0.0.qualifier
5+
Bundle-Version: 1.0.1.qualifier
66
Eclipse-RegisterBuddy: org.knime.knip.imagej2.core
77
Bundle-Vendor: University of Konstanz / FIJI (http://3dviewer.neurofly.de/)
8-
Require-Bundle: org.knime.workbench.repository;bundle-version="[2.8.0,3.0.0)",
8+
Require-Bundle: org.knime.workbench.repository;bundle-version="[2.10.0,3.0.0)",
99
org.apache.log4j;bundle-version="1.2.15",
1010
org.eclipse.core.runtime,
1111
org.eclipse.ui,
12-
org.knime.knip.base;bundle-version="[1.1.0,2.0.0)",
13-
org.knime.knip.core;bundle-version="[1.1.0,2.0.0)",
14-
org.knime.knip.imagej2.core;bundle-version="[0.8.0,0.9.0)",
15-
org.knime.core;bundle-version="[2.8.2,3.0.0)"
16-
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
12+
org.knime.knip.base;bundle-version="[1.2.0,2.0.0)",
13+
org.knime.knip.core;bundle-version="[1.2.0,2.0.0)",
14+
org.knime.knip.imagej2.core;bundle-version="[0.9.0,0.10.0)",
15+
org.knime.core;bundle-version="[2.10.0,3.0.0)"
16+
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
1717
Bundle-ClassPath: .,
1818
lib/ij3d_knip_build.jar,
1919
lib/j3dcore.jar,

0 commit comments

Comments
 (0)