JAL-2136 merged and resolved conflicts with 80edaa84d6d9beac9f0d2c71b50b7b56fd393427

[jalview.git] / .cvsignore

diff --git a/.cvsignore b/.cvsignore
index 299b74e..51ece2d 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -47,12 +47,12 @@ Run Jalview Release.launch
 Run Jalview Release HugeMem.launch
 Run Jalview Groovy Vamsas Release (1).launch
 Run Jalview Lite From Jar (1).launch
 Run Jalview Release HugeMem.launch
 Run Jalview Groovy Vamsas Release (1).launch
 Run Jalview Lite From Jar (1).launch

-.classpath

 Run Jalview Groovy Vamsas Release.launch
 Run Jalview Groovy Vamsas Release.launch

-.project

 Run Jalview Lite.launch
 Run Jalview Lite From Jar.launch
 Run Jalview Questionnaire.launch
 Run Jalview Groovy Release.launch
 Run Jalview Lite.launch
 Run Jalview Lite From Jar.launch
 Run Jalview Questionnaire.launch
 Run Jalview Groovy Release.launch

-.externalToolBuilders
-.settings
+lib-old
+statcvs
+statcvs_out
+jp_gEHhZay.results_files