diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-05-29 14:50:39 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-05-29 14:50:39 -0300 |
| commit | 7780685a8beb8fbba54d5c366905d9ece5569008 (patch) | |
| tree | 265a8340cfad6a92a1c2696003221956c81cdfc4 /data | |
| parent | b24fd83c64f2b166a192e9cf7835e5f35a15c1e5 (diff) | |
| parent | c928400ff02adf6c23c5341c2139e95f2c49976d (diff) | |
Merge remote-tracking branch 'ivan/feature/logger_window_rev4' into develop
Diffstat (limited to 'data')
| -rw-r--r-- | data/images/oxygen-icons/dialog-error.png | bin | 0 -> 1527 bytes | |||
| -rw-r--r-- | data/images/oxygen-icons/dialog-information.png | bin | 0 -> 1636 bytes | |||
| -rw-r--r-- | data/images/oxygen-icons/dialog-warning.png | bin | 0 -> 1354 bytes | |||
| -rw-r--r-- | data/images/oxygen-icons/document-save-as.png | bin | 0 -> 2152 bytes | |||
| -rw-r--r-- | data/images/oxygen-icons/edit-bomb.png | bin | 0 -> 1635 bytes | |||
| -rw-r--r-- | data/images/oxygen-icons/script-error.png | bin | 0 -> 1709 bytes | |||
| -rw-r--r-- | data/resources/loggerwindow.qrc | 11 |
7 files changed, 11 insertions, 0 deletions
diff --git a/data/images/oxygen-icons/dialog-error.png b/data/images/oxygen-icons/dialog-error.png Binary files differnew file mode 100644 index 00000000..01bc922d --- /dev/null +++ b/data/images/oxygen-icons/dialog-error.png diff --git a/data/images/oxygen-icons/dialog-information.png b/data/images/oxygen-icons/dialog-information.png Binary files differnew file mode 100644 index 00000000..ee59e170 --- /dev/null +++ b/data/images/oxygen-icons/dialog-information.png diff --git a/data/images/oxygen-icons/dialog-warning.png b/data/images/oxygen-icons/dialog-warning.png Binary files differnew file mode 100644 index 00000000..8e913378 --- /dev/null +++ b/data/images/oxygen-icons/dialog-warning.png diff --git a/data/images/oxygen-icons/document-save-as.png b/data/images/oxygen-icons/document-save-as.png Binary files differnew file mode 100644 index 00000000..9695a564 --- /dev/null +++ b/data/images/oxygen-icons/document-save-as.png diff --git a/data/images/oxygen-icons/edit-bomb.png b/data/images/oxygen-icons/edit-bomb.png Binary files differnew file mode 100644 index 00000000..2b36224c --- /dev/null +++ b/data/images/oxygen-icons/edit-bomb.png diff --git a/data/images/oxygen-icons/script-error.png b/data/images/oxygen-icons/script-error.png Binary files differnew file mode 100644 index 00000000..c7ace707 --- /dev/null +++ b/data/images/oxygen-icons/script-error.png diff --git a/data/resources/loggerwindow.qrc b/data/resources/loggerwindow.qrc new file mode 100644 index 00000000..847ca9a1 --- /dev/null +++ b/data/resources/loggerwindow.qrc @@ -0,0 +1,11 @@ +<RCC> + <qresource prefix="/"> + <file>../images/oxygen-icons/edit-bomb.png</file> + <file>../images/oxygen-icons/document-save-as.png</file> + <file>../images/oxygen-icons/dialog-information.png</file> + <file>../images/oxygen-icons/script-error.png</file> + <file>../images/oxygen-icons/dialog-error.png</file> + <file>../images/oxygen-icons/dialog-information.png</file> + <file>../images/oxygen-icons/dialog-warning.png</file> + </qresource> +</RCC> |
