diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2014-08-18 20:25:06 -0500 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2014-08-18 20:25:06 -0500 |
| commit | 150676ce3df0f60bd99204886c3a4e458253c093 (patch) | |
| tree | d722dafb6487d2dc56e78f8e39965fb1b7bed362 /subsurface.qrc | |
| parent | 48fe5254dc9540f6b9fc13ab17029e6c7b8de975 (diff) | |
| parent | 7264ec2fa877eeffa99745ac4d7af91b93217aa5 (diff) | |
| download | subsurface-150676ce3df0f60bd99204886c3a4e458253c093.tar.gz | |
Merge branch 'joshua-gsoc' of git://github.com/thiagomacieira/subsurface into josh
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Conflicts:
subsurface.pro
Diffstat (limited to 'subsurface.qrc')
| -rw-r--r-- | subsurface.qrc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/subsurface.qrc b/subsurface.qrc index dfeea6819..1951bb424 100644 --- a/subsurface.qrc +++ b/subsurface.qrc @@ -59,10 +59,11 @@ <file alias="icon_ead">icons/ead.png</file> <file alias="icon_HR">icons/icon-HR.png</file> <file alias="calendar">icons/calendarbg.png</file> - <file alias="pictures">icons/pictures.png</file> + <file alias="pictures">icons/pictures.png</file> <file>icons/subsurface/index.theme</file> <file>icons/subsurface/32x32/actions/go-down.png</file> <file>icons/subsurface/32x32/actions/go-up.png</file> <file>icons/subsurface/32x32/actions/window-close.png</file> + <file>icons/ostc3.png</file> </qresource> </RCC> |