81f49ee02aaa3bc870401f8883bf52742eb3ea7a |
|
20-May-2013 |
Jonathan von Schroeder <sternkinder@gmail.com> |
Merge branch 'hybrid'
Conflicts:
CASL/Logic_CASL.hs
Comorphisms/LogicGraph.hs
git-svn-id: https://svn-agbkb.informatik.uni-bremen.de/Hets/trunk@17960 cec4b9c1-7d33-0410-9eda-942365e851bb |