Christian Amend 793c56e80c Merge branch 'olingo168' ... Conflicts: lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmNavigationPropertyImpl.java lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmEntityContainer.java lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmEnumTypeImpl.java lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParseTreeVisitor.java lib/server-core/src/test/java/org/apache/olingo/server/core/testutil/EdmTechProvider.java lib/server-core/src/test/java/org/apache/olingo/server/core/uri/UriResourceImplTest.java		2014-04-02 09:30:53 +02:00
..
src	Merge branch 'olingo168'	2014-04-02 09:30:53 +02:00
pom.xml	Merge from master	2014-03-12 13:53:59 +01:00