commit | f4420f85337d0fbc7acc1c1210ccae4087b97a15 | [log] [tgz] |
---|---|---|
author | Philip Langer <planger@eclipsesource.com> | Tue Mar 10 20:28:06 2015 +0100 |
committer | Philip Langer <planger@eclipsesource.com> | Tue Mar 10 20:28:06 2015 +0100 |
tree | 6f2d5093bbf7a1349ea7d6918d33cf4f7abea76c | |
parent | 92029f6241a7a1a0e7e6584690ec43a746938fd6 [diff] |
[458147] Three-way merging for rejecting opaque element body changes Bug: 458147 Change-Id: I5462f6f514efddf5e5a9f12982e015a84fe95743 Signed-off-by: Philip Langer <planger@eclipsesource.com>