diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-09-20 17:28:25 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-09-20 17:28:25 -0300 |
| commit | 1f0f8efc4cb985c082b3b8fe7b3dc45aed047a47 (patch) | |
| tree | 8d96c7a374c91699c55fb8c5b609aac222a94e74 /data | |
| parent | 9568093138c85212e15d50ade5d5fc7dcec9ff6e (diff) | |
| parent | 222ce2a1513a3776b3277ded365672d7d43ad2e4 (diff) | |
Merge branch 'release-0.3.3'0.3.3
Conflicts:
pkg/requirements.pip
setup.py
src/leap/bitmask/config/leapsettings.py
Diffstat (limited to 'data')
| -rw-r--r-- | data/resources/mainwindow.qrc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/data/resources/mainwindow.qrc b/data/resources/mainwindow.qrc index d1268186..1e4159b8 100644 --- a/data/resources/mainwindow.qrc +++ b/data/resources/mainwindow.qrc @@ -2,10 +2,8 @@ <qresource prefix="/"> <file>../images/mask-launcher.png</file> <file>../images/mask-icon.png</file> - <file>../images/watermark.png</file> <file>../images/leap-gray-big.png</file> <file>../images/Blue-Arrow-Right-32.png</file> - <file>../images/Globe.png</file> <file>../images/leap-color-big.png</file> <file>../images/Arrow-Down-32.png</file> <file>../images/Arrow-Up-32.png</file> @@ -15,7 +13,6 @@ <file>../images/conn_connecting-light.png</file> <file>../images/conn_connected-light.png</file> <file>../images/conn_error-light.png</file> - <file>../images/leap-color-small.png</file> <file>../images/Dialog-accept.png</file> <file>../images/Dialog-error.png</file> <file>../images/Emblem-question.png</file> |