[midPoint-git] [Evolveum/midpoint] 135279: Avoiding pointless warning of 'Duplicate definitio...

[Pavol Mederly]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 13527944362d14b9697ad74e729ddea24aa1c1b7
      https://github.com/Evolveum/midpoint/commit/13527944362d14b9697ad74e729ddea24aa1c1b7
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/Expression.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/ExpressionUtil.java

  Log Message:
  -----------
  Avoiding pointless warning of 'Duplicate definition of variable {http://midpoint.evolveum.com/xml/ns/public/common/common-3}actor'


  Commit: 54db37b38f75cc7ebf6ed4ea153a30f17e6a7eec
      https://github.com/Evolveum/midpoint/commit/54db37b38f75cc7ebf6ed4ea153a30f17e6a7eec
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
    M gui/admin-gui/src/main/resources/initial-objects/200-lookup-languages.xml
    A samples/objects/lookup-languages-all.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


Compare: https://github.com/Evolveum/midpoint/compare/26fde3849b54...54db37b38f75