icon-themes/elementary/links.txt | 5 ++++-
icon-themes/tango/links.txt | 7 -------
postprocess/packimages/image-sort.lst | 7 -------
3 files changed, 4 insertions(+), 15 deletions(-)
New commits:
commit 696c9a90c42fabcdde342892073b1377e1249278
Author: melikeyurtoglu <aysemelikeyurto...@gmail.com>
Date: Sat Jan 23 23:30:51 2016 +0200
tdf#95360 Fix use of icons used only from help, but not in the code
Change-Id: Ic6a4295b86500be0b00d2eb89273fce252a42433
Signed-off-by: melikeyurtoglu <aysemelikeyurto...@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/21738
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: jan iversen <j...@documentfoundation.org>
diff --git a/icon-themes/elementary/links.txt b/icon-themes/elementary/links.txt
index f5985b5..c2be474 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 63cf1fd..6526691 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
diff --git a/postprocess/packimages/image-sort.lst
b/postprocess/packimages/image-sort.lst
index ac4842b..9d8cf08 100644
--- a/postprocess/packimages/image-sort.lst
+++ b/postprocess/packimages/image-sort.lst
@@ -47,14 +47,7 @@ svx/res/caution_11x16.png
svx/res/notcertificate_16.png
res/sc10223.png
res/sc10224.png
-res/sx03250.png
-res/sx03249.png
-res/sx03246.png
-res/sx03245.png
res/sx03139.png
-res/sx03248.png
-res/sx03247.png
-res/sx03255.png
res/sx03242.png
-- literal
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
