diff options
| author | Marco Pesenti Gritti <mpg@redhat.com> | 2007-09-24 19:08:26 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <mpg@redhat.com> | 2007-09-24 19:08:26 (GMT) |
| commit | 9b68754ba5c1f63d7ca6adfee3ef6114628c175e (patch) | |
| tree | 351767f819241965d51f7d5aeb600d3226c12bee /shell/sugar-shell | |
| parent | 90bf68d0f3a7f96561dfe22c46721db585f4bdc9 (diff) | |
| parent | e3f97b042f2ffddcef8d10ae6d9bd3cb4f6c19c1 (diff) | |
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Conflicts:
NEWS
Diffstat (limited to 'shell/sugar-shell')
| -rwxr-xr-x | shell/sugar-shell | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/shell/sugar-shell b/shell/sugar-shell index 93f2faa..106a9d7 100755 --- a/shell/sugar-shell +++ b/shell/sugar-shell @@ -147,6 +147,9 @@ if __name__ == '__main__': main() + hw_manager = hardwaremanager.get_manager() + hw_manager.startup() + try: gtk.main() except KeyboardInterrupt: |