Merge branch 'master' of ssh://git.xonotic.org/xonotic

diff --git a/misc/logos/icons_icns/Xonotic.icns b/misc/logos/icons_icns/Xonotic.icns
index 7fda030563b3149b0f41785726af95f6edb18c9b..c93bd34365775692aa3dfa980500b65c27f1c0f0 100644 (file)
Binary files a/misc/logos/icons_icns/Xonotic.icns and b/misc/logos/icons_icns/Xonotic.icns differ

diff --git a/misc/logos/icons_ico/xonotic.ico b/misc/logos/icons_ico/xonotic.ico
new file mode 100644 (file)
index 0000000..8076e1b
Binary files /dev/null and b/misc/logos/icons_ico/xonotic.ico differ

diff --git a/misc/logos/icons_ico/xonotic_128.ico b/misc/logos/icons_ico/xonotic_128.ico
deleted file mode 100644 (file)
index c588903..0000000
Binary files a/misc/logos/icons_ico/xonotic_128.ico and /dev/null differ

diff --git a/misc/logos/icons_ico/xonotic_16.ico b/misc/logos/icons_ico/xonotic_16.ico
deleted file mode 100644 (file)
index e6047f9..0000000
Binary files a/misc/logos/icons_ico/xonotic_16.ico and /dev/null differ

diff --git a/misc/logos/icons_ico/xonotic_22.ico b/misc/logos/icons_ico/xonotic_22.ico
deleted file mode 100644 (file)
index 0b8208e..0000000
Binary files a/misc/logos/icons_ico/xonotic_22.ico and /dev/null differ

diff --git a/misc/logos/icons_ico/xonotic_24.ico b/misc/logos/icons_ico/xonotic_24.ico
deleted file mode 100644 (file)
index 6dc4557..0000000
Binary files a/misc/logos/icons_ico/xonotic_24.ico and /dev/null differ

diff --git a/misc/logos/icons_ico/xonotic_256.ico b/misc/logos/icons_ico/xonotic_256.ico
deleted file mode 100644 (file)
index 8ee2236..0000000
Binary files a/misc/logos/icons_ico/xonotic_256.ico and /dev/null differ

diff --git a/misc/logos/icons_ico/xonotic_32.ico b/misc/logos/icons_ico/xonotic_32.ico
deleted file mode 100644 (file)
index b470163..0000000
Binary files a/misc/logos/icons_ico/xonotic_32.ico and /dev/null differ

diff --git a/misc/logos/icons_ico/xonotic_48.ico b/misc/logos/icons_ico/xonotic_48.ico
deleted file mode 100644 (file)
index 7cf932a..0000000
Binary files a/misc/logos/icons_ico/xonotic_48.ico and /dev/null differ

diff --git a/misc/logos/icons_ico/xonotic_64.ico b/misc/logos/icons_ico/xonotic_64.ico
deleted file mode 100644 (file)
index a1d99e8..0000000
Binary files a/misc/logos/icons_ico/xonotic_64.ico and /dev/null differ

diff --git a/misc/tools/xonotic.brand b/misc/tools/xonotic.brand
index af1ed9eca1407c9541c176d3dfcfa4e71026727f..22ce063787f98a8d8bd524faeb15100abcba6f73 100644 (file)
--- a/misc/tools/xonotic.brand
+++ b/misc/tools/xonotic.brand
@@ -5,6 +5,6 @@ dirname2=
 screenshotname=xonotic
 userdirname=xonotic
 icon_icns="$d0/misc/logos/icons_icns/xonotic.icns"
-icon_ico="$d0/misc/logos/icons_ico/xonotic_64.ico"
+icon_ico="$d0/misc/logos/icons_ico/xonotic.ico"
 icon_xpm="$d0/misc/logos/icons_xpm/xonotic_32.xpm"
-icons_tga="$d0/misc/logos/icons_png/xonotic_64.png $d0/misc/logos/icons_png/xonotic_16.png $d0/misc/logos/icons_png/xonotic_22.png $d0/misc/logos/icons_png/xonotic_24.png $d0/misc/logos/icons_png/xonotic_32.png $d0/misc/logos/icons_png/xonotic_48.png $d0/misc/logos/icons_png/xonotic_128.png $d0/misc/logos/icons_png/xonotic_256.png $d0/misc/logos/icons_png/xonotic_512.png"
+icons_tga="$d0/misc/logos/icons_png/xonotic_64.png $d0/misc/logos/icons_png/xonotic_16.png $d0/misc/logos/icons_png/xonotic_22.png $d0/misc/logos/icons_png/xonotic_24.png $d0/misc/logos/icons_png/xonotic_32.png $d0/misc/logos/icons_png/xonotic_48.png $d0/misc/logos/icons_png/xonotic_128.png $d0/misc/logos/icons_png/xonotic_256.png"