diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-28 17:50:31 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-28 17:50:31 +0200 |
commit | c60e5eab7103796f3059a64959843ea2c0a821c0 (patch) | |
tree | fe9cceeb670130bc404fa7caba65d3c2378b26af /LGPL_EXCEPTION.txt | |
parent | c58b4a5076f7a7f9404cbdb25a3c20476d998ad6 (diff) | |
parent | ad22f63229345aca8d8ab0eba5dba17cbb6614f1 (diff) | |
download | qtx11extras-c60e5eab7103796f3059a64959843ea2c0a821c0.tar.gz |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: Ibf8b681e5501561add1a02ba99b82056a4d4b102
Diffstat (limited to 'LGPL_EXCEPTION.txt')
0 files changed, 0 insertions, 0 deletions