Apache
/
olingo-odata4
mirror of https://github.com/apache/olingo-odata4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
Mirror of Apache Olingo
218 Commits 34 Branches 36 Tags 63 MiB
Java 99.9%
Go to file
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
ODataJClient Merge branch 'olingo200' of https://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4 into olingo200 2014-03-19 17:58:20 +01:00
fit fixes OLINGO-227 2014-04-01 19:02:07 +02:00
lib Merge branch 'olingo168' 2014-04-02 09:30:53 +02:00
src Setup for eclipse, Disclaimer and gitignore file 2013-11-07 13:32:22 +01:00
.gitignore [OLINGO-227] added some rat test and gitignore excludes for generated files 2014-04-01 13:55:16 +02:00
DISCLAIMER Setup for eclipse, Disclaimer and gitignore file 2013-11-07 13:32:22 +01:00
pom.xml fixes OLINGO-227 2014-04-01 19:02:07 +02:00