Merge branch 'dev' into alpha

miguelnunes miguelnunes 2014-10-03

removed output.bcmscenario
removed output.epc
removed output.genericbcm
changed src/main/java/converter/Main.java
changed .gitignore
changed pom.xml
output.bcmscenario
File was removed.
output.epc
File was removed.
output.genericbcm
File was removed.
src/main/java/converter/Main.java Diff Switch to side-by-side view
Loading...
.gitignore Diff Switch to side-by-side view
Loading...
pom.xml Diff Switch to side-by-side view
Loading...