summaryrefslogtreecommitdiff
path: root/icon-themes
diff options
context:
space:
mode:
authormelikeyurtoglu <aysemelikeyurtoglu@gmail.com>2016-01-23 23:30:51 +0200
committerjan iversen <jani@documentfoundation.org>2016-01-28 07:52:36 +0000
commit696c9a90c42fabcdde342892073b1377e1249278 (patch)
tree401494e682185ccdad03f56f3b44ece0153775dc /icon-themes
parent701324a1e1f7e0c181ff1a50956ced686785ea53 (diff)
tdf#95360 Fix use of icons used only from help, but not in the code
Change-Id: Ic6a4295b86500be0b00d2eb89273fce252a42433 Signed-off-by: melikeyurtoglu <aysemelikeyurtoglu@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/21738 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: jan iversen <jani@documentfoundation.org>
Diffstat (limited to 'icon-themes')
-rw-r--r--icon-themes/elementary/links.txt5
-rw-r--r--icon-themes/tango/links.txt7
2 files changed, 4 insertions, 8 deletions
diff --git a/icon-themes/elementary/links.txt b/icon-themes/elementary/links.txt
index f5985b5a0660..c2be4745baec 100644
--- a/icon-themes/elementary/links.txt
+++ b/icon-themes/elementary/links.txt
@@ -416,7 +416,6 @@ res/lc06300.png cmd/lc_navigateforward.png
res/lc06301.png cmd/lc_navigateback.png
res/lc10853.png cmd/lc_searchdialog.png
res/lx03189.png svx/res/galdefl.png
-res/lx03248.png res/odm_32_8.png
res/lx03256.png cmd/lc_addons.png
res/minus.png sfx2/res/minus.png
res/plugin.png cmd/lc_addons.png
@@ -449,12 +448,16 @@ res/sx03227.png res/sx03160.png
res/sx03228.png res/sx03160.png
res/sx03243.png res/so03123.png
res/sx03244.png res/so03123.png
+<<<<<<< HEAD
res/sx03245.png res/odb_16_8.png
res/sx03246.png res/odg_16_8.png
res/sx03247.png res/odf_16_8.png
res/sx03248.png res/odm_16_8.png
res/sx03249.png res/odp_16_8.png
res/sx03250.png res/ods_16_8.png
+=======
+res/sx03251.png res/odt_16_8.png
+>>>>>>> tdf#95360 Fix use of icons used only from help, but not in the code
res/sx03256.png cmd/sc_addons.png
sc/imglst/lc26047.png cmd/lc_insertformula.png
sc/imglst/lc26048.png cmd/lc_autosum.png
diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt
index 63cf1fd654f3..652669101572 100644
--- a/icon-themes/tango/links.txt
+++ b/icon-themes/tango/links.txt
@@ -64,13 +64,10 @@ res/lx03256.png cmd/lc_addons.png
res/plugin.png cmd/lc_addons.png
res/extension_plus_32.png desktop/res/extension_32.png
svtools/res/fp011.png fpicker/res/fp015.png
-res/sx03250.png res/ods_16_8.png
res/sx03132.png res/sx03127.png
res/sc10854.png res/target.png
res/im30821.png res/im30820.png
res/sx03145.png res/sx03144.png
-res/lx03248.png res/odm_32_8.png
-res/sx03249.png res/odp_16_8.png
res/fileopen.png formula/res/fapclose.png
res/foldercl.png formula/res/fapclose.png
sc/res/file.png formula/res/fapclose.png
@@ -83,15 +80,11 @@ svx/res/galnors.png formula/res/fapclose.png
res/lx03189.png svx/res/galdefl.png
svx/res/galnorl.png svx/res/galdefl.png
svx/res/galrdol.png svx/res/galdefl.png
-res/sx03246.png res/odg_16_8.png
res/sx03228.png res/sx03160.png
res/so03227.png res/sx03160.png
res/sx03227.png res/sx03160.png
-res/sx03245.png res/odb_16_8.png
-res/sx03247.png res/odf_16_8.png
res/fp015.png res/newdoc.png
fpicker/res/fp014.png res/newdoc.png
-res/sx03248.png res/odm_16_8.png
sd/res/playblue_16.png avmedia/res/av02049.png
sd/res/breakplayingblue_16.png avmedia/res/av02050.png
avmedia/res/avl02053.png cmd/lc_ok.png