[gnome-system-monitor/ubergraph: 147/147] Merge remote-tracking branch 'origin' into ubergraph
- From: Robert Roth <robertroth src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-system-monitor/ubergraph: 147/147] Merge remote-tracking branch 'origin' into ubergraph
- Date: Sat, 12 Oct 2013 02:32:39 +0000 (UTC)
commit 14839049e0d664ab985f4a2802de0c9f655479dd
Merge: 7f74382 6f4ef88
Author: Robert Roth <robert roth off gmail com>
Date: Sat Oct 12 05:32:01 2013 +0300
Merge remote-tracking branch 'origin' into ubergraph
Conflicts:
.gitignore
.gitignore | 5 +-
Makefile.am | 11 +
NEWS | 108 ++
configure.ac | 12 +-
data/gsm.css | 5 +
data/interface.ui | 698 +++++-----
data/menus.ui | 6 +-
gnome-system-monitor.appdata.xml.in | 30 +
gnome-system-monitor.doap | 7 +-
po/POTFILES.in | 8 +-
po/POTFILES.skip | 1 +
po/ar.po | 1273 +++++++++-------
po/as.po | 1052 +++++++-------
po/be.po | 909 ++++++------
po/ca.po | 988 ++++++-------
po/ca valencia po | 988 ++++++-------
po/cs.po | 550 ++++----
po/da.po | 1042 +++++++------
po/de.po | 595 ++++----
po/es.po | 726 +++++-----
po/et.po | 502 ++++---
po/eu.po | 1020 +++++++------
po/fa.po | 1103 +++++++-------
po/fi.po | 1058 +++++++-------
po/fr.po | 940 ++++++------
po/ga.po | 1544 ++++++++++++--------
po/gl.po | 594 ++++----
po/he.po | 595 ++++----
po/hu.po | 1040 +++++++------
po/id.po | 911 ++++++------
po/it.po | 837 +++++------
po/ja.po | 1061 ++++++--------
po/ko.po | 1009 +++++++------
po/lt.po | 658 +++++----
po/lv.po | 1056 +++++++-------
po/nb.po | 490 +++----
po/pa.po | 1018 +++++++------
po/pl.po | 938 ++++++------
po/pt.po | 1047 +++++++-------
po/pt_BR.po | 1059 ++++++++------
po/ru.po | 1092 +++++++--------
po/sk.po | 995 ++++++-------
po/sl.po | 1006 +++++++------
po/sr.po | 925 ++++++-------
po/sr latin po | 925 ++++++-------
po/tg.po | 597 ++++----
po/uk.po | 1029 +++++++------
po/zh_HK.po | 575 ++++----
po/zh_TW.po | 579 ++++----
src/Makefile.am | 18 +-
src/{procman-app.cpp => application.cpp} | 283 +---
src/{procman-app.h => application.h} | 35 +-
src/argv.cpp | 3 +-
src/argv.h | 6 +-
src/cgroups.cpp | 8 +-
src/cgroups.h | 15 +-
src/defaulttable.h | 6 +-
src/disks.cpp | 51 +-
src/disks.h | 19 +-
src/e_date.h | 6 +-
src/gsm.gresource.xml | 1 +
src/gsm_color_button.c | 499 +++----
src/gsm_color_button.h | 66 +-
src/{procman_gksu.cpp => gsm_gksu.cpp} | 6 +-
src/gsm_gksu.h | 13 +
src/{procman_gnomesu.cpp => gsm_gnomesu.cpp} | 6 +-
src/gsm_gnomesu.h | 13 +
src/{procman_pkexec.cpp => gsm_pkexec.cpp} | 6 +-
src/gsm_pkexec.h | 13 +
src/iconthemewrapper.h | 6 +-
src/interface.cpp | 165 +--
src/interface.h | 13 +-
src/load-graph.cpp | 64 +-
src/load-graph.h | 6 +-
src/lsof.cpp | 9 +-
src/lsof.h | 10 +-
src/{procman.cpp => main.cpp} | 8 +-
src/memmaps.cpp | 73 +-
src/memmaps.h | 10 +-
src/openfiles.cpp | 32 +-
src/openfiles.h | 10 +-
...g.gnome.gnome-system-monitor.gschema.xml.in.in} | 25 +-
src/prefsdialog.cpp | 316 ++++
src/prefsdialog.h | 9 +
src/prettytable.cpp | 5 +-
src/prettytable.h | 6 +-
src/procactions.cpp | 32 +-
src/procactions.h | 17 +-
src/procdialogs.cpp | 319 +----
src/procdialogs.h | 18 +-
src/procman_gksu.h | 13 -
src/procman_gnomesu.h | 13 -
src/procman_pkexec.h | 13 -
src/procproperties.cpp | 8 +-
src/procproperties.h | 11 +-
src/proctable.cpp | 256 +---
src/proctable.h | 26 +-
src/selinux.cpp | 2 +-
src/selinux.h | 8 +-
src/settings-keys.h | 10 +-
src/smooth_refresh.cpp | 12 +-
src/smooth_refresh.h | 6 +-
src/treeview.c | 283 ++++
src/treeview.h | 43 +
src/util.cpp | 33 +-
src/util.h | 15 +-
106 files changed, 19519 insertions(+), 18676 deletions(-)
---
diff --cc .gitignore
index 9dff72d,556dc06..fe6f40d
--- a/.gitignore
+++ b/.gitignore
@@@ -75,14 -74,6 +75,15 @@@ xmldocs.mak
*.mo
*.o
*.patch
+uber/.deps/
+uber/.libs/
+scripts/.deps/
+scripts/gsm-kill
+scripts/gsm-renice
+gnome-system-monitor-kde.desktop
+gnome-system-monitor-kde.desktop.in
+compile
*.tar.bz2
*.tar.xz
+ *~
+
diff --cc configure.ac
index c628b04,59f548f..dabfa89
--- a/configure.ac
+++ b/configure.ac
@@@ -127,8 -120,8 +124,9 @@@ YELP_HELP_INI
AC_CONFIG_FILES([
Makefile
scripts/Makefile
+uber/Makefile
src/Makefile
+ src/org.gnome.gnome-system-monitor.gschema.xml.in
po/Makefile.in
help/Makefile
gnome-system-monitor.desktop.in
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
