Merge branch 'dev' into alpha

miguelnunes miguelnunes 2014-10-03

changed src/main/java/net/timbusproject/iermtoowl/genericbcm/Recovery.java
changed src/main/java/net/timbusproject/iermtoowl/utils/OntologyMapper.java
changed src/main/java/net/timbusproject/iermtoowl/Main.java
changed catalog-v001.xml
src/main/java/net/timbusproject/iermtoowl/genericbcm/Recovery.java Diff Switch to side-by-side view
Loading...
src/main/java/net/timbusproject/iermtoowl/utils/OntologyMapper.java Diff Switch to side-by-side view
Loading...
src/main/java/net/timbusproject/iermtoowl/Main.java Diff Switch to side-by-side view
Loading...
catalog-v001.xml Diff Switch to side-by-side view
Loading...