Merge branch 'master' into intensity-transform
[trakem2.git] / .gitignore
blobecc86004d808873530e7b908a823f2025e9f32fa
1 *.swp
2 *~
3 target/
4 .project
5 .settings
6 .classpath