diff options
author | Kali Kaneko <kali@leap.se> | 2013-08-14 21:38:20 +0200 |
---|---|---|
committer | Kali Kaneko <kali@leap.se> | 2013-08-14 21:38:20 +0200 |
commit | 2adb0ef6e0a73f40ce4cd66f7c59d0d777badca9 (patch) | |
tree | 219f9f32fd56c772b93294ecffa2ff54e64ca927 /data/resources/mainwindow.qrc | |
parent | 74f401c1c5d096313cc519544cb1415b145df5e4 (diff) | |
parent | 85ad7ed3ed64e75b3eae60db82f65460ac7017b4 (diff) |
Merge remote-tracking branch 'chiiph/bug/retr_conf_hangs' into develop
Diffstat (limited to 'data/resources/mainwindow.qrc')
0 files changed, 0 insertions, 0 deletions