Proyecto Desarrollo De internalizacion
Subida de clases
Commit de configuracion
se suben clases correctas
projectos
JPA de Desarrollo
Descomento
c
commit inicial
primer commit
config database
Merge branch 'master' of https://github.com/sidlors/Frameworks

Conflicts:
	hibernate/3_hibernate-jpa_1_d/src/main/java/com/example/as/AccionBursatilAS.java
	hibernate/3_hibernate-jpa_1_d/src/main/java/com/example/dao/AccionBursatilDAO.java
	struts2/2__struts2_3_1_d/.settings/org.eclipse.wst.common.component
	struts2/2__struts2_3_1_d/src/main/resources/log4j.properties
	struts2/2__struts2_3_1_d/src/main/resources/struts.xml
	struts2/2__struts2_3_1_d/target/classes/log4j.properties
	struts2/2__struts2_3_1_d/target/classes/struts.xml
	struts2/2__struts2_3_1_d/target/src/main/java/com/example/action/PojoAction.java
	struts2/2__struts2_3_1_d/target/src/main/java/com/example/dto/UsuarioDTO.java
	struts2/2__struts2_3_1_d/target/src/main/resources/log4j.properties
	struts2/2__struts2_3_1_d/target/src/main/resources/struts.xml
	struts2/2__struts2_3_1_d/target/src/main/webapp/WEB-INF/web.xml
	struts2/2__struts2_3_1_d/target/src/main/webapp/WEB-INF/web.xml frozen
	struts2/2__struts2_3_1_d/target/src/main/webapp/index.html
	struts2/2__struts2_3_1_d/target/src/main/webapp/prueba_fin.jsp
	struts2/2__struts2_3_1_d/target/src/main/webapp/prueba_inicio.jsp
	struts2/2_struts2_3_1_i/target/m2e-wtp/web-resources/META-INF/maven/com.example.2_struts2_3_1_i/2_struts2_3_1_i/pom.properties
	struts2/2_struts2_4_1_i/.classpath
	struts2/2_struts2_4_1_i/.gitignore
	struts2/2_struts2_4_1_i/_etc/alteraciones.txt
	struts2/2_struts2_4_1_i/src/main/java/com/example/action/LocaleAction.java
	struts2/2_struts2_4_1_i/src/main/java/com/example/action/LoginAction.java
	struts2/2_struts2_4_1_i/src/main/java/com/example/web/FilterValidadorSesion.java
	struts2/2_struts2_4_1_i/src/main/webapp/login.jsp
	struts2/2_struts2_4_1_i/src/main/webapp/welcome.jsp
	struts2/2_struts2_4_1_i/target/classes/com/example/action/LocaleAction.class
	struts2/2_struts2_4_1_i/target/classes/com/example/action/LoginAction.class
	struts2/2_struts2_4_1_i/target/classes/com/example/web/FilterValidadorSesion.class
	struts2/2_struts2_4_1_i/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF
	struts2/2_struts2_4_1_i/target/m2e-wtp/web-resources/META-INF/maven/com.example.2_struts2_4_1_i/2_struts2_4_1_i/pom.properties