aaaaa
.gitignore: bin/
Now classpath and bin folder are ignored.
no changes....
 a
Merge branch 'master' into myrama
a
Delete .classpath
bin/ and .classpath deleted
Merge branch 'master' of github.com:chinitoluigi/blab_fussionevents
.settings
jSpinner_ftime_getValue()
Merge branch 'prueba' of https://github.com/luisveliz/blab_fussionevents into prueba

Conflicts:
	.classpath
	.settings/org.eclipse.jdt.core.prefs
	bin/FEAnalyzer_$1.class
	bin/FEAnalyzer_$10.class
	bin/FEAnalyzer_$2.class
	bin/FEAnalyzer_$3.class
	bin/FEAnalyzer_$4.class
	bin/FEAnalyzer_$5.class
	bin/FEAnalyzer_$6.class
	bin/FEAnalyzer_$7.class
	bin/FEAnalyzer_$8.class
	bin/FEAnalyzer_$9.class
	bin/FEAnalyzer_.class
	bin/FEinPixel.class
	bin/GUIInfo.class
	bin/GUIfe$1.class
	bin/GUIfe$10.class
	bin/GUIfe$11.class
	bin/GUIfe$12.class
	bin/GUIfe$13.class
	bin/GUIfe$14.class
	bin/GUIfe$15.class
	bin/GUIfe$16.class
	bin/GUIfe$17.class
	bin/GUIfe$18.class
	bin/GUIfe$19.class
	bin/GUIfe$2.class
	bin/GUIfe$20.class
	bin/GUIfe$21.class
	bin/GUIfe$22.class
	bin/GUIfe$23.class
	bin/GUIfe$24.class
	bin/GUIfe$25.class
	bin/GUIfe$3.class
	bin/GUIfe$4.class
	bin/GUIfe$5.class
	bin/GUIfe$6.class
	bin/GUIfe$7.class
	bin/GUIfe$8.class
	bin/GUIfe$9.class
	bin/GUIfe.class
	bin/JFreeChartIntensityVSxy.class
	bin/JFreeChartXYParamVSTime.class
	bin/Pos.class
	bin/PreviewCanvas.class
	bin/PreviewStackWindow.class
	bin/fitter/GaussianFit.class
	bin/fitter/LM.class
	bin/fitter/LMfunc.class
	bin/fitter/Pulse.class
Merge branch 'prueba' of https://github.com/luisveliz/blab_fussionevents into prueba

Conflicts:
	FussionEvents_.jar
	bin/FEAnalyzer_$1.class
	bin/FEAnalyzer_$10.class
	bin/FEAnalyzer_$2.class
	bin/FEAnalyzer_$3.class
	bin/FEAnalyzer_$4.class
	bin/FEAnalyzer_$5.class
	bin/FEAnalyzer_$6.class
	bin/FEAnalyzer_$7.class
	bin/FEAnalyzer_$8.class
	bin/FEAnalyzer_$9.class
	bin/FEAnalyzer_.class