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 6d1998f9
Prev Next
Show latest version
2 files
+ 527
− 84
Compare changes
  • Side-by-side
  • Inline
Files
2
  • 6d1998f9
    Daniela Genius
    merge · 6d1998f9
    Daniela Genius authored 
    Merge branch 'master' of gitlab.enst.fr:mbe-tools/TTool into new-lip6

Conflicts:
	src/main/java/ui/util/DefaultText.java
src/main/java/ui/util/DefaultText.java
+ 526
− 83

Files with large changes are collapsed by default.