From: Andre Noll <maan@tuebingen.mpg.de>
Date: Fri, 28 Apr 2017 13:47:39 +0000 (+0200)
Subject: Merge branch 'refs/heads/t/logo-0.6'
X-Git-Tag: v0.6.0~1
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=bd28ec9a64884d70917c4fdea1a3a70c91758f83;hp=764e71ceb1e188086c08e38dfd52d45b67dc15ba

Merge branch 'refs/heads/t/logo-0.6'

The new logo in .png and .ico format.

Cooking for three weeks.

* refs/heads/t/logo-0.6:
  Reduce size of paraslash.ico.
  The new logo for v0.6.x.
---

diff --git a/NEWS.md b/NEWS.md
index 8a9e4980..1012012f 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -60,6 +60,7 @@ NEWS
   "+9:30".
 - The new --fade-exponent option of para_mixer allows for non-linear
   channel fading.
+- The new logo.
 
 Downloads:
 [tarball](./releases/paraslash-git.tar.bz2),
diff --git a/web/images/paraslash.ico b/web/images/paraslash.ico
index fd17a649..06ff0336 100644
Binary files a/web/images/paraslash.ico and b/web/images/paraslash.ico differ
diff --git a/web/images/paraslash.png b/web/images/paraslash.png
index a06d6a1a..804752cf 100644
Binary files a/web/images/paraslash.png and b/web/images/paraslash.png differ