diff options
author | 2020-06-07 20:19:26 -0400 | |
---|---|---|
committer | 2020-06-07 20:19:26 -0400 | |
commit | adddfa282a0fe78bfdc5ffb967996d89293aa45c (patch) | |
tree | ef9b3dbed5bd4fa850d890a67b4c7ee3c1648782 /Application | |
parent | VAMPIRE: Rebase on Master (diff) | |
parent | VAMPIRE: Rebase on Master (diff) | |
download | VIATRA-Generator-adddfa282a0fe78bfdc5ffb967996d89293aa45c.tar.gz VIATRA-Generator-adddfa282a0fe78bfdc5ffb967996d89293aa45c.tar.zst VIATRA-Generator-adddfa282a0fe78bfdc5ffb967996d89293aa45c.zip |
Merge branch 'Vampire-New' into Vampire-New
Conflicts:
Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin
Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin
Application/hu.bme.mit.inf.dslreasoner.application/xtend-gen/hu/bme/mit/inf/dslreasoner/application/validation/QueryAndMetamodelValidator.java
Domains/Examples/ModelGenExampleFAM_plugin/model/FamMetamodel.ecore
Domains/Examples/ModelGenExampleFAM_plugin/plugin.xml
Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/META-INF/MANIFEST.MF
Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/ContentInNotLive.java
Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/DirectSupertype.java
Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Live.java
Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/LoopInInheritence.java
Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/NonSymmetricOpposite.java
Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Opposite.java
Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/OppositeDifferentClass.java
Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/PatternContent.java
Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/META-INF/MANIFEST.MF
Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/plugin.xml
Framework/hu.bme.mit.inf.dslreasoner.logic.model/META-INF/MANIFEST.MF
Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/Logic2AlloyLanguageMapper_TypeScopeMapping.xtend
Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/META-INF/MANIFEST.MF
Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/Entry.java
Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/Synchronization.java
Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/EntryImpl.java
Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/SynchronizationImpl.java
Diffstat (limited to 'Application')
-rw-r--r-- | Application/hu.bme.mit.inf.dslreasoner.application.ui/plugin.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ui/plugin.xml b/Application/hu.bme.mit.inf.dslreasoner.application.ui/plugin.xml index 099d6993..9f35e6da 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application.ui/plugin.xml +++ b/Application/hu.bme.mit.inf.dslreasoner.application.ui/plugin.xml | |||
@@ -426,5 +426,5 @@ | |||
426 | style="push"> | 426 | style="push"> |
427 | </command> | 427 | </command> |
428 | </menuContribution> | 428 | </menuContribution> |
429 | </extension> | 429 | </extension> |
430 | </plugin> | 430 | </plugin> |