[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.4' - 3 commits - configure.ac sysui/desktop

[Andras Timar]

 configure.ac                  |    2 +-
 sysui/desktop/icons/main.icns |binary
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 16c4258332e9f1b261c504eb000d022c513facd8
Author: Andras Timar <andras.timar at collabora.com>
Date:   Fri Aug 21 18:08:26 2015 +0200

    allow sifr
    
    Change-Id: Id15942828d0fac3f509b6541a2c82dc62e046cd7

diff --git a/configure.ac b/configure.ac
index 55f66db..0534b27 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12686,7 +12686,7 @@ if test "$enable_mpl_subset" = "yes"; then
     fi
     for theme in $WITH_THEMES; do
         case $theme in
-        crystal|default|hicontrast|human|oxygen|sifr)
+        crystal|default|hicontrast|human|oxygen)
             AC_MSG_ERROR([need to disable icon themes from '$WITH_THEMES': $theme present, use --with-theme=tango]) ;;
         *) : ;;
         esac
commit 729fe73bea6c0480359526409c2c094471d1798f
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sun Sep 21 20:32:54 2014 +0300

    Make the OS X icon round
    
    Should really play with GIMP or something to add some (subtle)
    embossing effects.
    
    Change-Id: I5bdb63c974bf20200b7d5e8c1f598d93aeca34db
    (cherry picked from commit 6a750e189eda0b0e1a8e6e30c84739764b36692a)

diff --git a/sysui/desktop/icons/main.icns b/sysui/desktop/icons/main.icns
index 9ef3f72..b2029bd 100644
Binary files a/sysui/desktop/icons/main.icns and b/sysui/desktop/icons/main.icns differ
commit 44f95beff67fec5e26c51b8f1b94f9fe37f91cf5
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Sep 12 23:49:21 2014 +0300

    Use the white on purple LOfC icon
    
    Change-Id: I2c49e5018742f35c57ab1290b783e47ed0a3b73b
    (cherry picked from commit 0307129596344fb40dc5ade2fb6a6dd913b1799e)

diff --git a/sysui/desktop/icons/main.icns b/sysui/desktop/icons/main.icns
index c3e1bf6..9ef3f72 100644
Binary files a/sysui/desktop/icons/main.icns and b/sysui/desktop/icons/main.icns differ