summaryrefslogtreecommitdiffstats
path: root/LICENSE.GPL2
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2015-08-09 15:26:42 +0200
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2015-08-09 15:26:42 +0200
commit1fe941917a3c93d74e9058f8ca9ed2b6b8ac78a3 (patch)
treee2d6638089d69c7d0497923a320f146b9d3eb47a /LICENSE.GPL2
parent77c5d38325e35660be86e0bde3c18a7e2180ccf9 (diff)
parenta3ec0e469e9fbc49af3151f9f747ee980fae22cd (diff)
Merge remote-tracking branch 'origin/5.5' into dev
Diffstat (limited to 'LICENSE.GPL2')
0 files changed, 0 insertions, 0 deletions