[gnome-system-monitor/wip/newdesign: 6/7] Merge remote-tracking branch 'origin' into wip/newdesign

[Robert Roth <robertroth src gnome org>]

commit 9bdb3f0aa6f685c9ce3e124b0e7a5e18f19b298b
Merge: 8cb07b2 d796c47
Author: Robert Roth <robert roth off gmail com>
Date:   Mon Aug 12 01:18:23 2013 +0300

    Merge remote-tracking branch 'origin' into wip/newdesign

 po/he.po               |  194 ++++++++++++++++++++-------------------
 src/Makefile.am        |    3 +-
 src/application.cpp    |  167 ---------------------------------
 src/application.h      |   19 ----
 src/argv.cpp           |    1 -
 src/cgroups.cpp        |    6 +-
 src/cgroups.h          |    7 +-
 src/disks.cpp          |   29 ++----
 src/load-graph.cpp     |   13 ---
 src/lsof.cpp           |    3 -
 src/main.cpp           |    4 -
 src/memmaps.cpp        |   20 ++--
 src/openfiles.cpp      |   24 ++----
 src/procactions.cpp    |   22 ++--
 src/procactions.h      |    6 +
 src/procdialogs.cpp    |   10 +-
 src/proctable.cpp      |  109 ++++++----------------
 src/proctable.h        |    3 -
 src/settings-keys.h    |    2 +-
 src/smooth_refresh.cpp |    6 +-
 src/treeview.c         |  241 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/treeview.h         |   43 +++++++++
 src/util.cpp           |   19 +----
 src/util.h             |    7 --
 24 files changed, 470 insertions(+), 488 deletions(-)
---