Merge branch '1.1.1' of github.com:knime-ip/knip-vtk into 1.1.1 · knime-ip/knip-vtk@a75e9db · GitHub

Commit

Merge branch '1.1.1' of github.com:knime-ip/knip-vtk into 1.1.1

Browse files

Conflicts:
	org.knime.knip.vtk.bin.windows.amd64/META-INF/MANIFEST.MF
	org.knime.knip.vtk.bin.windows.x86/META-INF/MANIFEST.MF

Loading branch information

dietzc committed Jun 27, 2014

2 parents f6bffce + 67a860a commit a75e9db