| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | correcciones en validaciones, todo funcionandosamurey | sreyes | 2014-12-07 | 6 | -26/+28 |
| | | |||||
| * | Merge remote-tracking branch 'remotes/origin/Cecilia' into samurey | sreyes | 2014-12-07 | 23 | -67/+80 |
| |\ | |||||
| | * | Cambios en las interfaces y simulador | cecigg | 2014-12-07 | 23 | -68/+81 |
| | | | |||||
| | * | Merge remote-tracking branch 'remotes/origin/samurey' into Cecilia | cecigg | 2014-10-19 | 4 | -48/+78 |
| | |\ | |||||
| | * | | ajuste en tipo de alumno | cecigg | 2014-10-19 | 1 | -2/+2 |
| | | | | |||||
| * | | | espacio de porqueria | sreyes | 2014-12-07 | 1 | -1/+0 |
| | |/ |/| | |||||
| * | | mejora en seleccionUtilidadMax | sreyes | 2014-10-19 | 1 | -16/+44 |
| | | | |||||
| * | | Merge remote-tracking branch 'remotes/origin/Cecilia' into samurey | sreyes | 2014-10-19 | 3 | -26/+58 |
| |\ \ | |/ | | | | | | | Conflicts: EjercitarServer/ejbModule/beans/SimulacionBean.java | ||||
| | * | ajustes de parametros | cecigg | 2014-10-19 | 3 | -20/+46 |
| | | | |||||
| | * | se arreglo el nivel de 1/n | cecigg | 2014-10-15 | 1 | -4/+4 |
| | | | |||||
| * | | no se que toque | sreyes | 2014-10-19 | 1 | -1/+1 |
| | | | |||||
| * | | Merge remote-tracking branch 'remotes/origin/Cecilia' into samurey | sreyes | 2014-10-12 | 2 | -3/+8 |
| |\ \ | |/ | | | | | | | Conflicts: EjercitarServer/ejbModule/beans/SimulacionBean.java | ||||
| | * | se modifico el archivo | cecigg | 2014-10-12 | 3 | -4/+9 |
| | | | |||||
| * | | clear de listas | sreyes | 2014-10-12 | 5 | -41/+37 |
| | | | |||||
| * | | Merge remote-tracking branch 'remotes/origin/Cecilia' into samurey | sreyes | 2014-10-12 | 16 | -71/+139 |
| |\ \ | |/ | | | | | | | | | Conflicts: EjercitarJPA/build/classes/model/Ejercicio.class EjercitarJPA/build/classes/model/Sesion.class | ||||
| | * | se arreglo simulacion | cecigg | 2014-10-12 | 4 | -47/+72 |
| | | | |||||
| | * | Merge remote-tracking branch 'remotes/origin/samurey' into Cecilia | cecigg | 2014-10-11 | 2 | -2/+9 |
| | |\ | |||||
| | * | | correcion simular | cecigg | 2014-10-11 | 17 | -27/+70 |
| | | | | |||||
| * | | | g | sreyes | 2014-10-12 | 2 | -0/+0 |
| | |/ |/| | |||||
| * | | correccion del jpa | sreyes | 2014-10-11 | 3 | -3/+10 |
| |/ | |||||
| * | Merge remote-tracking branch 'remotes/origin/samurey' into Cecilia | cecigg | 2014-10-11 | 7 | -15/+168 |
| |\ | | | | | | | | | | | Conflicts: EjercitarJPA/build/classes/model/Alumno.class EjercitarJPA/build/classes/model/Profesor.class | ||||
| | * | |||||
 |
index : ejercitar/ejercitar | |
| d956b8566730961d06632aa282a400a4af |
| summaryrefslogtreecommitdiffstats |