diff options
author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-08-09 15:26:50 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-08-09 15:26:50 +0200 |
commit | 7d75db90cc22ca02a30b1c15e7c684ff0b4f6d5f (patch) | |
tree | d1386f720c4fe985c05ce11b6e55dcd54c5af86f /.gitignore | |
parent | 03dec8534776881d6a0f03f3e468efe5e805de6a (diff) | |
parent | adfed1222fbe73267f4a3be149d9acff158ddfa1 (diff) |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: If4411ac45ddf612ddfa450a7f62cbce66172ccfd
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions