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
..
models/jetbrains/mps/typechecking/handler	merge branch 'lightweightsolver' into 'master'	2015-12-08 12:00:11 +03:00
jetbrains.mps.typechecking.handling.msd	merge branch 'lightweightsolver' into 'master'	2015-12-08 12:00:11 +03:00