Merge branch 'master' into ppa-daily-trunk
authorJean-Philippe Orsini <jeanfi@gmail.com>
Mon, 1 Sep 2014 16:00:20 +0000 (18:00 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Mon, 1 Sep 2014 16:00:20 +0000 (18:00 +0200)
commit06abeddc3fa8a3984c2300ab7223a350589d7c46
tree3407cfe307813e87e6b1a0294d03de08463a399f
parent9830d95c63d6058fcc42a057d159ac9ce1e4fed7
parent31da77449282683c241ccf4e8e82112691bc8b0c
Merge branch 'master' into ppa-daily-trunk

Conflicts:
debian/changelog
23 files changed:
Makefile.in
aclocal.m4
config.h.in
configure
debian/psensor.install
doc/Makefile.in
icons/hicolor/14x14/Makefile.in
icons/hicolor/16x16/Makefile.in
icons/hicolor/22x22/Makefile.in
icons/hicolor/24x24/Makefile.in
icons/hicolor/32x32/Makefile.in
icons/hicolor/48x48/Makefile.in
icons/hicolor/64x64/Makefile.in
icons/hicolor/scalable/Makefile.in
icons/ubuntu-mono-dark/apps/22/Makefile.in
icons/ubuntu-mono-dark/status/22/Makefile.in
icons/ubuntu-mono-light/status/22/Makefile.in
src/Makefile.in
src/glade/Makefile.in
src/lib/Makefile.in
src/server/Makefile.in
tests/Makefile.in
www/Makefile.in