Merge branch 'v1.1'
authorJean-Philippe Orsini <jeanfi@gmail.com>
Mon, 29 Sep 2014 07:45:54 +0000 (09:45 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Mon, 29 Sep 2014 07:45:54 +0000 (09:45 +0200)
Conflicts:
NEWS

1  2 
NEWS
configure.ac
src/Makefile.am

diff --cc NEWS
--- 1/NEWS
--- 2/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
  ------
diff --cc configure.ac
Simple merge
diff --cc src/Makefile.am
Simple merge