[GRASS-SVN] r67966 - grass/branches/releasebranch_7_0/gui/icons

[svn_grass at osgeo.org]

Author: martinl
Date: 2016-02-27 04:20:27 -0800 (Sat, 27 Feb 2016)
New Revision: 67966

Modified:
   grass/branches/releasebranch_7_0/gui/icons/Makefile
   grass/branches/releasebranch_7_0/gui/icons/grass.ico
   grass/branches/releasebranch_7_0/gui/icons/grass_osgeo.ico
Log:
sync grass icons from trunk (new version done by Vincent Bain)


Modified: grass/branches/releasebranch_7_0/gui/icons/Makefile
===================================================================
--- grass/branches/releasebranch_7_0/gui/icons/Makefile	2016-02-26 18:01:22 UTC (rev 67965)
+++ grass/branches/releasebranch_7_0/gui/icons/Makefile	2016-02-27 12:20:27 UTC (rev 67966)
@@ -28,10 +28,11 @@
 	$(INSTALL_DATA) grass.svg $(ARCH_DISTDIR)/share/icons/hicolor/scalable/apps/grass70.svg
 	$(MKDIR) $(ARCH_DISTDIR)/share/appdata
 	$(INSTALL_DATA) grass.appdata.xml $(ARCH_DISTDIR)/share/appdata
-ifeq ($(findstring x86_64,$(ARCH)),x86_64)
-	$(INSTALL_DATA) x86_64/grass.ico $(GUIDIR)/icons
-	$(INSTALL_DATA) x86_64/grass_osgeo.ico $(GUIDIR)/icons
-endif
+### disable special 64bit icons (using different icons can be confusing for the user)
+# ifeq ($(findstring x86_64,$(ARCH)),x86_64)
+# 	$(INSTALL_DATA) x86_64/grass.ico $(GUIDIR)/icons
+# 	$(INSTALL_DATA) x86_64/grass_osgeo.ico $(GUIDIR)/icons
+# endif
 
 $(GUIDIR)/icons/%: % | $(DSTDIRS)
 	$(INSTALL_DATA) $< $@

Modified: grass/branches/releasebranch_7_0/gui/icons/grass.ico
===================================================================
(Binary files differ)

Modified: grass/branches/releasebranch_7_0/gui/icons/grass_osgeo.ico
===================================================================
(Binary files differ)