Óscar González Fernández bb6fd1993e ItEr57S07RFInfraestucturaEscenariosItEr56S07: Merge branch 'master' into scenarios ... Conflicts: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Task.java navalplanner-business/src/main/resources/navalplanner-business-spring-config.xml navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/ResourceAllocations.hbm.xml navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/TaskTest.java navalplanner-business/src/test/resources/navalplanner-business-spring-config-test.xml navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java navalplanner-webapp/src/main/resources/navalplanner-webapp-spring-config.xml navalplanner-webapp/src/test/resources/navalplanner-webapp-spring-config-test.xml		2010-05-05 19:18:35 +02:00
..
src	ItEr57S07RFInfraestucturaEscenariosItEr56S07: Merge branch 'master' into scenarios	2010-05-05 19:18:35 +02:00
pom.xml	Merge branch 'master' into scenarios	2010-04-09 11:16:31 +02:00