diff options
author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-02-15 15:08:35 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-02-15 15:08:42 +0200 |
commit | b6217fb2bb7702324da2a9f3f45be4a60e6ffe6c (patch) | |
tree | 0441e7a387778d93fe13027c312fbf16d3c87cfc /.gitmodules | |
parent | ed50a72433d401176635b946e48481736e98ae6b (diff) | |
parent | e9b1f8253908c43ab75d5ea77b4a13fa3ab8ad89 (diff) |
Merge remote-tracking branch 'origin/dev' into 5.6
* origin/dev:
Add missing quit.png
Initial implementation of Diana's design
Fade to black
Change-Id: Ic9ea6a2de9490999f276b63b64dd5e723709e7e3
Diffstat (limited to '.gitmodules')
0 files changed, 0 insertions, 0 deletions