diff options
| author | kali <kali@leap.se> | 2012-11-28 01:11:05 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2012-11-28 01:11:05 +0900 |
| commit | 16f19a225a922dd77f3f6c75c94194ebd229fc67 (patch) | |
| tree | d77ba10cdad970b5025e75daa2b3be24e35ce0c7 /data | |
| parent | 862014f68fce37318f77309a8f8f9782dabc60d2 (diff) | |
| parent | 3ea766452e3c4708c724509d03001c0a0314fcf6 (diff) | |
Merge branch 'feature/wizard-usability' into develop
Diffstat (limited to 'data')
| -rw-r--r-- | data/images/Dialog-accept.png | bin | 0 -> 1316 bytes | |||
| -rw-r--r-- | data/images/Dialog-error.png | bin | 0 -> 1380 bytes | |||
| -rw-r--r-- | data/images/Emblem-question.png | bin | 0 -> 1260 bytes | |||
| -rw-r--r-- | data/images/checked.png | bin | 1375 -> 0 bytes | |||
| -rw-r--r-- | data/images/leapfrog.jpg | bin | 1767 -> 0 bytes | |||
| -rw-r--r-- | data/resources/mainwindow.qrc | 4 |
6 files changed, 3 insertions, 1 deletions
diff --git a/data/images/Dialog-accept.png b/data/images/Dialog-accept.png Binary files differnew file mode 100644 index 00000000..5a8a0bdb --- /dev/null +++ b/data/images/Dialog-accept.png diff --git a/data/images/Dialog-error.png b/data/images/Dialog-error.png Binary files differnew file mode 100644 index 00000000..51da2f5b --- /dev/null +++ b/data/images/Dialog-error.png diff --git a/data/images/Emblem-question.png b/data/images/Emblem-question.png Binary files differnew file mode 100644 index 00000000..b2163e5b --- /dev/null +++ b/data/images/Emblem-question.png diff --git a/data/images/checked.png b/data/images/checked.png Binary files differdeleted file mode 100644 index fbaf90f2..00000000 --- a/data/images/checked.png +++ /dev/null diff --git a/data/images/leapfrog.jpg b/data/images/leapfrog.jpg Binary files differdeleted file mode 100644 index a1ddf4bb..00000000 --- a/data/images/leapfrog.jpg +++ /dev/null diff --git a/data/resources/mainwindow.qrc b/data/resources/mainwindow.qrc index 2fc43b13..59abdbcd 100644 --- a/data/resources/mainwindow.qrc +++ b/data/resources/mainwindow.qrc @@ -5,6 +5,8 @@ <file>../images/conn_connected.png</file> <file>../images/leapfrog.jpg</file> <file>../images/leap-color-small.png</file> - <file>../images/checked.png</file> + <file>../images/Dialog-accept.png</file> + <file>../images/Dialog-error.png</file> + <file>../images/Emblem-question.png</file> </qresource> </RCC> |
