Merge branch 'master' into toMakeCallStaticMethods
Conflicts:
	src/org/ntlab/deltaViewer/CollaborationLayout.java
	src/org/ntlab/deltaViewer/CollaborationViewer.java
	src/org/ntlab/deltaViewer/DeltaViewer.java
	src/org/ntlab/deltaViewer/MagnetRONViewer.java
commit b28670a809f0b1429b1db758b524b02310ad2094
2 parents a5e2717 + e9194ed
Naoya Nitta authored on 19 Sep 2021
Showing 3 changed files
View
src/org/ntlab/deltaViewer/CollaborationViewer.java
View
src/org/ntlab/deltaViewer/DeltaViewer.java
View
src/org/ntlab/deltaViewer/MagnetRONViewer.java