[gnome-system-monitor/ubergraph: 2/2] Merge remote-tracking branch 'origin' into ubergraph

[Robert Roth <robertroth src gnome org>]

commit 7f7438244f1eae761413845d1b6e3813478a35d4
Merge: 4aa4589 b4f345c
Author: Robert Roth <robert roth off gmail com>
Date:   Tue Aug 6 00:26:57 2013 +0300

    Merge remote-tracking branch 'origin' into ubergraph

 src/Makefile.am        |    4 +-
 src/disks.cpp          |   21 ++++-----
 src/interface.cpp      |   44 +++++++++++--------
 src/memmaps.cpp        |    3 +-
 src/openfiles.cpp      |    4 +-
 src/procdialogs.cpp    |   26 ++++++++---
 src/procman-app.cpp    |  115 ++++++++++++++++++++++--------------------------
 src/proctable.cpp      |   27 ++++++-----
 src/settings-keys.cpp  |   16 -------
 src/settings-keys.h    |   39 +++++++++++-----
 src/smooth_refresh.cpp |    3 +-
 11 files changed, 154 insertions(+), 148 deletions(-)
---