Multiple COMBINE authors. Fixed typo "annotion" Merge branch 'master' of https://github.com/binfalse/incubator-taverna-language
Fixes TAVERNA-846 This closes #15 Contribution by Martin Schwarm. Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/212d30b9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/212d30b9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/212d30b9 Branch: refs/heads/master Commit: 212d30b99e496ee887b0a996790dafd3b1e0ef2c Parents: 8b92725 3cf8cf7 Author: Stian Soiland-Reyes <[email protected]> Authored: Mon Jul 13 16:09:50 2015 +0100 Committer: Stian Soiland-Reyes <[email protected]> Committed: Mon Jul 13 16:09:50 2015 +0100 ---------------------------------------------------------------------- .../robundle/manifest/PathAnnotation.java | 7 +++++++ .../manifest/combine/CombineManifest.java | 20 ++++++++++++++------ 2 files changed, 21 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
