From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Thu, 10 Apr 2014 06:46:26 +0000 (+0200)
Subject: Merge branch 'master' into v0.8
X-Git-Tag: v0.8.0.5~1
X-Git-Url: https://git.wpitchoune.net/gitweb/?a=commitdiff_plain;h=a8dd3fee101b033c301b2dc6e5bcb6dbac970ca5;hp=1e962866189e8ec75390500ea41d02baba48aa2d;p=psensor.git

Merge branch 'master' into v0.8
---

diff --git a/NEWS b/NEWS
index 9df4350..b9e6375 100644
--- a/NEWS
+++ b/NEWS
@@ -15,11 +15,10 @@ v0.8.0.5
 * Merged Turkish translation from LP (İbrahim Çelik).
 * Added Dutch translation from LP (Pjotr12345).
 * Fixed some french translations.
-* AppIndicator icons: removed shadow, added padding. (Closes LP:
-#1290072).
+* AppIndicator icons: removed shadow, added padding. (LP: #1290072).
 * Fixed compilation issue with gtk3.10 and deprecation of
   GtkActionEntry. Menu is defined in glade file instead of
-  hardcoded. (Closes LP: #1304108).
+  hardcoded. (LP: #1304108).
 
 v0.8.0.4
 --------
diff --git a/NEWS.html b/NEWS.html
index 28ac749..ba5f0c6 100644
--- a/NEWS.html
+++ b/NEWS.html
@@ -441,15 +441,14 @@ Fixed some french translations.
 </li>
 <li>
 <p>
-AppIndicator icons: removed shadow, added padding. (Closes LP:
-#1290072).
+AppIndicator icons: removed shadow, added padding. (LP: #1290072).
 </p>
 </li>
 <li>
 <p>
 Fixed compilation issue with gtk3.10 and deprecation of
   GtkActionEntry. Menu is defined in glade file instead of
-  hardcoded. (Closes LP: #1304108).
+  hardcoded. (LP: #1304108).
 </p>
 </li>
 </ul></div>
@@ -2475,7 +2474,7 @@ Fixed BR1: crash when no temperature sensor is available
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2014-04-10 01:57:33 CEST
+Last updated 2014-04-10 08:44:57 CEST
 </div>
 </div>
 </body>