From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Mon, 29 Sep 2014 07:45:54 +0000 (+0200)
Subject: Merge branch 'v1.1'
X-Git-Tag: v1.2.0~100
X-Git-Url: http://git.wpitchoune.net/gitweb/?p=psensor.git;a=commitdiff_plain;h=d6141b1d4fea0db9b115b06c668be6195ac4e5c6

Merge branch 'v1.1'

Conflicts:
	NEWS
---

d6141b1d4fea0db9b115b06c668be6195ac4e5c6
diff --cc NEWS
index 2218be0,5154de6..606c1d1
--- a/NEWS
+++ b/NEWS
@@@ -2,9 -2,10 +2,11 @@@ Psensor NEW
  ============
  
  v1.1.3
 -------
  
 +* Added tooltip explaining why a setting is not available.
 +* Removed support of old AppIndicator library < 3.0.
+ * Fixed compilation issue with gtk+3.14 due to deprecation
+   of GtkStatusIcon. (Closes: #763257).
  
  v1.1.2
  ------