olingo-odata4/lib/server-api
Christian Amend ec39fd600b Merge branch 'olingo167'
Conflicts:
	lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmEntityContainerImpl.java
2014-03-12 13:48:23 +01:00
..
src/main/java/org/apache/olingo/server/api Merge branch 'olingo167' 2014-03-12 13:48:23 +01:00
pom.xml [OLINGO-192] rename artifacts 2014-03-10 09:44:03 +01:00