diff options
author | Bernie Innocenti <bernie@codewiz.org> | 2010-07-30 23:25:28 (GMT) |
---|---|---|
committer | Bernie Innocenti <bernie@codewiz.org> | 2010-07-30 23:25:28 (GMT) |
commit | 9e1559a892b91178c3d8c8beac2dc66358736d71 (patch) | |
tree | bd790b0a3c2bc37e3024de315e61b6be4b49dd5c /rpms | |
parent | df3dbb1ed24d6822e9b48131b6eb437c269ca7a1 (diff) | |
parent | 0c76946c8e378e292c82e9b1df4defb44ae7638c (diff) |
Merge branch 'master' of git.sugarlabs.org:dextrose/mainline
Diffstat (limited to 'rpms')
-rw-r--r-- | rpms/sugar/cpu-and-memory-resource-indicator.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/rpms/sugar/cpu-and-memory-resource-indicator.patch b/rpms/sugar/cpu-and-memory-resource-indicator.patch index 36f5d49..5450644 100644 --- a/rpms/sugar/cpu-and-memory-resource-indicator.patch +++ b/rpms/sugar/cpu-and-memory-resource-indicator.patch @@ -1,4 +1,4 @@ -From 17708e9ca250f265bc0b4561515f0ac2758d00de Mon Sep 17 00:00:00 2001 +From f7d9d1b7e3166ea2558992bde9d3566a6b462868 Mon Sep 17 00:00:00 2001 From: anishmangal2002 <anishmangal2002@gmail.com> Date: Fri, 2 Jul 2010 20:45:28 +0530 Subject: [PATCH] Add cpu and memory resource indicator to frame @@ -15,22 +15,22 @@ Similarly, the palette menu entries are updated after every Signed-off-by: anishmangal2002 <anishmangal2002@gmail.com> --- - extensions/deviceicon/Makefile.am | 3 +- + extensions/deviceicon/Makefile.am | 1 + extensions/deviceicon/resources.py | 206 ++++++++++++++++++++++++++++++++++++ - 2 files changed, 208 insertions(+), 1 deletions(-) + 2 files changed, 207 insertions(+), 0 deletions(-) create mode 100644 extensions/deviceicon/resources.py diff --git a/extensions/deviceicon/Makefile.am b/extensions/deviceicon/Makefile.am -index 8a2e765..038c059 100644 +index 8a2e765..eff368d 100644 --- a/extensions/deviceicon/Makefile.am +++ b/extensions/deviceicon/Makefile.am -@@ -5,4 +5,5 @@ sugar_PYTHON = \ +@@ -4,5 +4,6 @@ sugar_PYTHON = \ + __init__.py \ + battery.py \ network.py \ ++ resources.py \ speaker.py \ - touchpad.py \ -- volume.py -+ volume.py \ -+ resources.py + volume.py diff --git a/extensions/deviceicon/resources.py b/extensions/deviceicon/resources.py new file mode 100644 index 0000000..331459d |