Skip to content
Snippets Groups Projects

New lip6

Closed New lip6
new-lip6 into master
Closed Daniela Genius requested to merge new-lip6 into master
Viewing commit 70aeaedf
Prev Next
Show latest version
Compare changes
  • Side-by-side
  • Inline
Files
47
  • 70aeaedf
    Daniela Genius
    merge · 70aeaedf
    Daniela Genius authored 
    Merge branch 'master' of gitlab.enst.fr:mbe-tools/TTool into new-lip6

Conflicts:
	src/main/java/syscamstranslator/toSysCAMSSoclib/PrimitiveCodeSoclib.java
	src/main/java/tmltranslator/TMLArchiTextSpecification.java