Christian Amend b1d03d6ba9 Merge branch 'master' into olingo786 ... Conflicts: lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEnumTypeImpl.java lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/EdmEnumTest.java lib/commons-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEnumTest.java lib/commons-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmTypeDefinitionImplTest.java lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEnumTest.java lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/xml/ODataXmlDeserializerTest.java		2015-10-13 10:35:50 +02:00
..
src	Merge branch 'master' into olingo786	2015-10-13 10:35:50 +02:00
pom.xml	[OLINGO-772] Set version to 4.1.0-SNAPSHOT	2015-09-21 14:46:38 +02:00