[midPoint-svn] midPoint branch gensync updated. v2.2-52-gedf0d7f

[Radovan Semancik]

Project "midPoint" branch gensync has been updated
       via  edf0d7f55dbfb24e87abe26bb3ce6c583b32f0af (commit) v2.2-52-gedf0d7f
       via  17974f4edd64b3683c6d64a4c98bce893dc6c740 (commit) v2.2-51-g17974f4
       via  5d31735b5c03e42dc7c31d0cc845fe6f0df71f62 (commit) v2.2-42-g5d31735
       via  ae1963fcf65583e7b520320b5dfcca8ff1992576 (commit) v2.2-40-gae1963f
      from  848dea65b92a8beb7b4e94cca433dae97d686430 (commit) v2.2-48-g848dea6

- Log -----------------------------------------------------------------
commit edf0d7f55dbfb24e87abe26bb3ce6c583b32f0af
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date:   Wed Sep 25 11:41:11 2013 +0200

    Compilation fix after merge

commit 17974f4edd64b3683c6d64a4c98bce893dc6c740
Merge: 848dea6 5d31735
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date:   Wed Sep 25 11:41:04 2013 +0200

    Merge branch 'master' into gensync
    
    Conflicts:
    	model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/LensContext.java
    	model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/AccountValuesProcessor.java
    	model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/Projector.java

-----------------------------------------------------------------------

(Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full)

Summary of changes:
 .../evolveum/midpoint/model/lens/LensContext.java  |   10 +++
 .../com/evolveum/midpoint/model/lens/LensUtil.java |    4 ++
 .../lens/projector/AccountValuesProcessor.java     |   72 +++++++++++++++-----
 .../midpoint/model/lens/projector/Projector.java   |   27 +++++---
 .../testing/consistency/ConsistencyTest.java       |    2 +-
 5 files changed, 89 insertions(+), 26 deletions(-)


hooks/post-receive
-- 
midPoint