Merge branch 'dev'

miguelnunes miguelnunes 2014-06-30

changed src/main/java/net/timbusproject/iermtoowl/utils/EPCReader.java
changed src/main/java/net/timbusproject/iermtoowl/utils/OntologyMapper.java
changed src/main/java/net/timbusproject/iermtoowl/Main.java
changed catalog-v001.xml
changed Readme.md
src/main/java/net/timbusproject/iermtoowl/utils/EPCReader.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...
Readme.md Diff Switch to side-by-side view
Loading...