Merge branch 'master' of http://iffwww.iff.kfa-juelich.de/~wuttke/frida2

Conflicts:
	.gitignore
	pub/src/.libs/frida2

.gitignore

@@ -25,7 +25,12 @@ autom4te.cache/*
 autom4te.cache
 config.log
 config.status
+<<<<<<< HEAD
 pub/*/.deps
 pub/*/.libs
+=======
+pub/*/.deps/*
+pub/*/.libs/*
+>>>>>>> cba91ba3602b321fa6b671046e6be62f143b8285
 demo/lm_test
 libtool

pub/src/edif.cpp

@@ -1113,11 +1113,12 @@ void NEdif::Plot( CPlot *plot, bool add )
                         printf( "  %u points < ymin\n", nyl );
                     if( nyh )
                         printf( "  %u points > ymax\n", nyh );
+                    continue;
                 } else {
                     plot->plotScan( false, pstyle++,
                                     xp, yp, dyp, *(e->Z(j)),
                                     e->P()->xco.str(), e->P()->yco.str(),
-                                    "data file "+strg(k)+" scan "+strg(j) );
+                                    "data file " + strg(k) + " scan "+strg(j) );
                 }
             } else if ( fc && fc->kconv!=-1 ) {
                 // plot only at x points of convolutand