Carlos Galindo 2613dc66e1 Update maven		2016-12-08 22:17:20 +01:00
.idea	Update maven	2016-12-08 22:17:20 +01:00
src	Main: added merge and multiple file opening	2016-12-08 22:17:03 +01:00
.gitignore	Cleaned proyect files	2016-06-12 13:50:33 +02:00
jstudy.iml	mvn version	2016-06-12 00:52:18 +02:00
pom.xml	version update	2016-06-13 19:17:39 +02:00