ejercitar/ejercitar - d956b8566730961d06632aa282a400a4af

	Commit message (Collapse)	Author	Age	Files	Lines
*	Cambios en las interfaces y simulador	cecigg	2014-12-07	2	-5/+5
\|
*	clear de listas	sreyes	2014-10-12	4	-0/+0
\|
*	Merge remote-tracking branch 'remotes/origin/Cecilia' into samurey	sreyes	2014-10-12	10	-21/+0
\|\ \| \| \| \| \| \| \| \| \| \|	Conflicts: EjercitarJPA/build/classes/model/Ejercicio.class EjercitarJPA/build/classes/model/Sesion.class
\| *	Merge remote-tracking branch 'remotes/origin/samurey' into Cecilia	cecigg	2014-10-11	1	-1/+4
\| \|\
\| * \|	correcion simular	cecigg	2014-10-11	13	-22/+1
\| \| \|
* \| \|	g	sreyes	2014-10-12	2	-0/+0
\| \|/ \|/\|
* \|	correccion del jpa	sreyes	2014-10-11	2	-2/+5
\|/
*	Merge remote-tracking branch 'remotes/origin/samurey' into Cecilia	cecigg	2014-10-11	2	-1/+21
\|\ \| \| \| \| \| \| \| \| \| \|	Conflicts: EjercitarJPA/build/classes/model/Alumno.class EjercitarJPA/build/classes/model/Profesor.class
\| *