| Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab/MagnetRON.git into auto_track_vertex Conflicts: src/org/ntlab/deltaViewer/MagnetRONViewer.java | 
|---|
| src/org/ntlab/deltaExtractor/DeltaExtractor.java | 
|---|
| src/org/ntlab/deltaExtractor/DeltaExtractorJSON.java | 
|---|
| src/org/ntlab/deltaViewer/CollaborationLayout.java | 
|---|
| src/org/ntlab/deltaViewer/CollaborationObjectCallGraph.java | 
|---|
| src/org/ntlab/deltaViewer/CollaborationViewer.java | 
|---|
| src/org/ntlab/deltaViewer/DeltaObjectCallGraph.java | 
|---|
| src/org/ntlab/deltaViewer/DeltaViewer.java | 
|---|
| src/org/ntlab/deltaViewer/ForwardAliasCollector.java | 
|---|
| src/org/ntlab/deltaViewer/ForwardLayout.java | 
|---|
| src/org/ntlab/deltaViewer/IObjectCallGraph.java | 
|---|
| src/org/ntlab/deltaViewer/MagnetRONViewer.java | 
|---|