diff options
| author | kali <kali@leap.se> | 2013-02-15 09:31:51 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2013-02-15 09:31:51 +0900 |
| commit | 9cea9c8a34343f8792d65b96f93ae22bd8685878 (patch) | |
| tree | 9f512367b1d47ced5614702a00f3ff0a8fe746d7 /data/resources | |
| parent | 7159734ec6c0b76fc7f3737134cd22fdaaaa7d58 (diff) | |
| parent | 1032e07a50c8bb265ff9bd31b3bb00e83ddb451e (diff) | |
Merge branch 'release/v0.2.0'
Conflicts:
README.txt
Diffstat (limited to 'data/resources')
| -rw-r--r-- | data/resources/locale.qrc | 6 | ||||
| -rw-r--r-- | data/resources/mainwindow.qrc | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/data/resources/locale.qrc b/data/resources/locale.qrc new file mode 100644 index 00000000..47fb5243 --- /dev/null +++ b/data/resources/locale.qrc @@ -0,0 +1,6 @@ +<!DOCTYPE RCC><RCC version="1.0"> +<qresource> +<file>../translations/es.qm</file> +<file>../translations/de.qm</file> +</qresource> +</RCC> diff --git a/data/resources/mainwindow.qrc b/data/resources/mainwindow.qrc index 9a2531c9..293988e1 100644 --- a/data/resources/mainwindow.qrc +++ b/data/resources/mainwindow.qrc @@ -3,6 +3,10 @@ <file>../images/conn_error.png</file> <file>../images/conn_connecting.png</file> <file>../images/conn_connected.png</file> - <file>../images/leapfrog.jpg</file> + <file>../images/leap-color-small.png</file> + <file>../images/watermark.png</file> + <file>../images/Dialog-accept.png</file> + <file>../images/Dialog-error.png</file> + <file>../images/Emblem-question.png</file> </qresource> </RCC> |