merged 1.1 branch into head

[mir.git] / .cvsignore

diff --git a/.cvsignore b/.cvsignore
index fbee38f..695478f 100755 (executable)
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,6 @@
-bin
 .classpath
 .project
+.settings
+bin
+build
+dist