fa90ec41aa
Conflicts: shell/HomeWindow.py |
||
---|---|---|
.. | ||
data | ||
PresenceService | ||
session | ||
__init__.py | ||
ActivitiesModel.py | ||
ActivityHost.py | ||
ActivityRegistry.py | ||
ChatController.py | ||
ConsoleWindow.py | ||
HomeWindow.py | ||
Makefile.am | ||
Owner.py | ||
PeopleWindow.py | ||
PresenceView.py | ||
Shell.py | ||
sugar | ||
sugar-activity | ||
sugar-activity-factory | ||
sugar-console | ||
sugar-people | ||
sugar-presence-service |