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/11 15:07:21 UTC

[3/4] git commit: Merge remote-tracking branch 'origin/master' into olingo200

Merge remote-tracking branch 'origin/master' into olingo200


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/4bcc9964
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/tree/4bcc9964
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/diff/4bcc9964

Branch: refs/heads/olingo200
Commit: 4bcc9964729f187ad0de2d366127af4a24eb616e
Parents: 4039990 781a9fb
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Tue Mar 11 14:28:55 2014 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Tue Mar 11 14:28:55 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(-)
----------------------------------------------------------------------