Marco Pesenti Gritti 15210f4cc4 Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar ... Conflicts: NEWS		2007-10-29 15:51:35 +01:00
..
controlpanel	Initial push for the sugar control panel	2007-10-29 14:36:14 +01:00
hardware
intro
model
view	Revert to the trial-3 frame behavior (always visible on	2007-10-29 15:49:17 +01:00
__init__.py
kbdconfig
logsmanager.py
Makefile.am
shellservice.py
sugar-shell