diff options
author | Iikka Eklund <iikka.eklund@digia.com> | 2014-04-01 11:47:57 +0300 |
---|---|---|
committer | Iikka Eklund <iikka.eklund@digia.com> | 2014-04-01 11:47:57 +0300 |
commit | 437c68fbff0f5b92272acd3fd6ef6ff7a1ad8e8e (patch) | |
tree | d0a9fac3e396f90ba3759af24811f1aaccfb8eff /LGPL_EXCEPTION.txt | |
parent | 29e29b42af59c4200051220b21d65a3bc54154a1 (diff) | |
parent | 947361a7dc8db093d0b8e1ec5ac953470a180259 (diff) | |
download | qtx11extras-437c68fbff0f5b92272acd3fd6ef6ff7a1ad8e8e.tar.gz |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I5e71d0948a944085be782f8a2108bc875d31db51
Diffstat (limited to 'LGPL_EXCEPTION.txt')
0 files changed, 0 insertions, 0 deletions