Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <mpg@redhat.com>2008-01-18 20:03:13 (GMT)
committer Marco Pesenti Gritti <mpg@redhat.com>2008-01-18 20:03:13 (GMT)
commit70b04042d2521f99171ca3bdad98eb97ac34752c (patch)
tree97f895c03dc5183f52403273eed58dcb7904a9e3
parentc03e6ba45e6f532aa3b18f42ce01cce3cb42bbef (diff)
parent45e5f21b42ed29315300c7d278174db4cfb62f30 (diff)
Merge branch 'update-1' of git+ssh://dev.laptop.org/git/sugar into update-1v0.75.10
-rw-r--r--[-rwxr-xr-x]shell/controlpanel/control.py0
1 files changed, 0 insertions, 0 deletions
diff --git a/shell/controlpanel/control.py b/shell/controlpanel/control.py
index 793d444..793d444 100755..100644
--- a/shell/controlpanel/control.py
+++ b/shell/controlpanel/control.py