New lip6 (!222) · Merge requests · mbe-tools / TTool · GitLab

Snippets Groups Projects

Closed Daniela Genius requested to merge new-lip6 into master 5 years ago

Viewing commit 6d1998f9

Show latest version

2 files

+ 527

− 84

Some changes are not shown

For a faster browsing experience, some files are collapsed by default.

Files

2

6d1998f9

merge · 6d1998f9

Daniela Genius authored 5 years ago

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 100755 → 100644

+ 0

− 0

File mode changed from 100755 to 100644