You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@olingo.apache.org by il...@apache.org on 2014/03/12 11:25:16 UTC

[2/8] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4


Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/commit/e936023f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/tree/e936023f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/diff/e936023f

Branch: refs/heads/olingo200
Commit: e936023fefefffecde10fdf5e3e4f60abf11d27a
Parents: 1d13520 781a9fb
Author: fmartelli <fa...@gmail.com>
Authored: Tue Mar 11 17:14:08 2014 +0100
Committer: fmartelli <fa...@gmail.com>
Committed: Tue Mar 11 17:14:08 2014 +0100

----------------------------------------------------------------------
 .../apache/olingo/client/api/edm/ConcurrencyMode.java |  2 +-
 .../olingo/client/api/edm/StoreGeneratedPattern.java  |  2 +-
 .../apache/olingo/client/api/edm/xml/v3/Property.java |  4 ++--
 .../client/core/edm/xml/PropertyDeserializer.java     | 14 +++++++-------
 .../olingo/client/core/edm/xml/v3/PropertyImpl.java   |  4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------