Fixed merge

miguelnunes miguelnunes 2014-09-26

1 2 > >> (Page 1 of 2)
added src/main/java/net/timbusproject/iermtoowl/utils/GenericBCMReader.java
added src/main/java/net/timbusproject/iermtoowl/utils/BCMScenarioReader.java
added src/main/java/net/timbusproject/iermtoowl/common/ImpactTable.java
added src/main/java/net/timbusproject/iermtoowl/genericbcm/BCMModel.java
added src/main/java/net/timbusproject/iermtoowl/genericbcm/MergedImpactTable.java
added src/main/java/net/timbusproject/iermtoowl/genericbcm/GlobalThreats.java
added src/main/java/net/timbusproject/iermtoowl/genericbcm/ResourceTypes.java
added src/main/java/net/timbusproject/iermtoowl/genericbcm/Dependencies.java
added src/main/java/net/timbusproject/iermtoowl/genericbcm/Recovery.java
added src/main/java/net/timbusproject/iermtoowl/genericbcm/Failures.java
added src/main/java/net/timbusproject/iermtoowl/genericbcm/CausedBy.java
added src/main/java/net/timbusproject/iermtoowl/genericbcm/RiskCategories.java
added src/main/java/net/timbusproject/iermtoowl/genericbcm/Units.java
added src/main/java/net/timbusproject/iermtoowl/bcmscenario/Entries.java
added src/main/java/net/timbusproject/iermtoowl/bcmscenario/BusinessImpactTable.java
added src/main/java/net/timbusproject/iermtoowl/bcmscenario/BcmScenarioModel.java
added src/main/java/net/timbusproject/iermtoowl/bcmscenario/Annotations.java
added src/main/java/net/timbusproject/iermtoowl/bcmscenario/XMI.java
added src/main/java/net/timbusproject/iermtoowl/bcmscenario/BcmUnits.java
added src/main/java/Test.java
added example.genericbcm
removed src/main/java/net/timbusproject/iermtoowl/risks
removed src/main/java/net/timbusproject/iermtoowl/risks/BusinessActivity.java
removed src/main/java/net/timbusproject/iermtoowl/risks/BusinessProcess.java
removed src/main/java/net/timbusproject/iermtoowl/risks/Resource.java
src/main/java/net/timbusproject/iermtoowl/utils/GenericBCMReader.java Diff Switch to unified view
Loading...
src/main/java/net/timbusproject/iermtoowl/utils/BCMScenarioReader.java Diff Switch to unified view
Loading...
src/main/java/net/timbusproject/iermtoowl/common/ImpactTable.java Diff Switch to unified view
Loading...
src/main/java/net/timbusproject/iermtoowl/genericbcm/BCMModel.java Diff Switch to unified view
Loading...
src/main/java/net/timbusproject/iermtoowl/genericbcm/MergedImpactTable.java Diff Switch to unified view
Loading...
src/main/java/net/timbusproject/iermtoowl/genericbcm/GlobalThreats.java Diff Switch to unified view
Loading...
src/main/java/net/timbusproject/iermtoowl/genericbcm/ResourceTypes.java Diff Switch to unified view
Loading...
src/main/java/net/timbusproject/iermtoowl/genericbcm/Dependencies.java Diff Switch to unified view
Loading...
src/main/java/net/timbusproject/iermtoowl/genericbcm/Recovery.java Diff Switch to unified view
Loading...
src/main/java/net/timbusproject/iermtoowl/genericbcm/Failures.java Diff Switch to unified view
Loading...
src/main/java/net/timbusproject/iermtoowl/genericbcm/CausedBy.java Diff Switch to unified view
Loading...
src/main/java/net/timbusproject/iermtoowl/genericbcm/RiskCategories.java Diff Switch to unified view
Loading...
src/main/java/net/timbusproject/iermtoowl/genericbcm/Units.java Diff Switch to unified view
Loading...
src/main/java/net/timbusproject/iermtoowl/bcmscenario/Entries.java Diff Switch to unified view
Loading...
src/main/java/net/timbusproject/iermtoowl/bcmscenario/BusinessImpactTable.java Diff Switch to unified view
Loading...
src/main/java/net/timbusproject/iermtoowl/bcmscenario/BcmScenarioModel.java Diff Switch to unified view
Loading...
src/main/java/net/timbusproject/iermtoowl/bcmscenario/Annotations.java Diff Switch to unified view
Loading...
src/main/java/net/timbusproject/iermtoowl/bcmscenario/XMI.java Diff Switch to unified view
Loading...
src/main/java/net/timbusproject/iermtoowl/bcmscenario/BcmUnits.java Diff Switch to unified view
Loading...
src/main/java/Test.java Diff Switch to unified view
Loading...
example.genericbcm Diff Switch to unified view
Loading...
1 2 > >> (Page 1 of 2)