Plain Diff
Conflicts: doc/src/legal/licenses.qdoc Change-Id: Id0fb35581b32d98cc9172a7eea6f6e2375cee1f0