projects / psensor-pkg-ubuntu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 75fa49f 5c1e07f)
Merge tag 'upstream/1.1.2'
authorJean-Philippe Orsini <jeanfi@gmail.com>
Mon, 22 Sep 2014 19:58:38 +0000 (21:58 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Mon, 22 Sep 2014 19:58:38 +0000 (21:58 +0200)
Upstream version 1.1.2

Conflicts:
configure


Trivial merge
Ubuntu packages for psensor