Mihail Buryakov 12a599a521 merge branch 'lightweightsolver' into 'master' ... Conflicts: languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.sampleplugin/models/jetbrains/mps/lang/typesystem2/sampleplugin/plugin.mps languages/jetbrains.mps.logic/jchr/jetbrains.mps.logic.jchr.msd languages/jetbrains.mps.logic/reactor/models/jetbrains/mps/logic/reactor/constraint.mps		2015-12-08 12:00:11 +03:00
..
jetbrains.mps.jchr	Support for java expressions as calls to extracted static methods	2015-12-07 11:37:25 +01:00
jetbrains.mps.lang.typesystem2	merge branch 'lightweightsolver' into 'master'	2015-12-08 12:00:11 +03:00
jetbrains.mps.logic	merge branch 'lightweightsolver' into 'master'	2015-12-08 12:00:11 +03:00
jetbrains.mps.typechecking.annotation	Refactoring in constraints API. Extracting the abstract evaluation interface	2015-11-28 18:45:42 +01:00