diff options
| author | cecigg <caggsld@gmail.com> | 2014-09-29 14:03:20 (GMT) |
|---|---|---|
| committer | cecigg <caggsld@gmail.com> | 2014-09-29 14:03:20 (GMT) |
| commit | 22ebd3fcc195bb2ee6023864dc55b93f2876f687 (patch) | |
| tree | 19edada07f29ae2493cefd0ec57f40da727b1145 /EjercitarJPA | |
| parent | d27b75e4f68fcc666546dbe2494a98b9b8fd2007 (diff) | |
| parent | 91abf102d0a2a826e7b9cb91492d8a425295a3f7 (diff) | |
Merge remote-tracking branch 'remotes/origin/samurey' into Cecilia
Conflicts:
EjercitarServer/ejbModule/beans/AdministracionBean.java
EjercitarWeb/src/src/CargarResultadosGeneralesTemasServlet.java
EjercitarWeb/src/src/CargarResultadosIndividualesServlet.java
EjercitarWeb/src/src/CargarResultadosServlet.java
Diffstat (limited to 'EjercitarJPA')
| -rw-r--r-- | EjercitarJPA/.classpath | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/EjercitarJPA/.classpath b/EjercitarJPA/.classpath index cd7cf55..76aecc3 100644 --- a/EjercitarJPA/.classpath +++ b/EjercitarJPA/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre6"> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre7"> <attributes> <attribute name="owner.project.facets" value="java"/> </attributes> |