| commit | 7224e855af20f6da23f82a01b860199afd804b5e | [log] [tgz] |
|---|---|---|
| author | mibo <mibo@mirb.de> | Wed Dec 10 20:30:05 2014 +0100 |
| committer | mibo <mibo@mirb.de> | Wed Dec 10 20:30:05 2014 +0100 |
| tree | f277610d881da93f4706435f73b01aa16583e10f | |
| parent | b85d531b61bf830f7a5a706729bdd882fe74f088 [diff] | |
| parent | 4bab6aab0f3de274df100f9a37dfa86992016d0c [diff] |
[OLINGO-129] Merge branch 'master' into Olingo-129_PocJpaDataStore Conflicts: odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/edm/AnnotationEdmProvider.java