c234b7b4a3
Conflicts: sugar/presence/Buddy.py |
||
---|---|---|
.. | ||
session | ||
__init__.py | ||
Makefile.am | ||
Owner.py | ||
PresenceWindow.py | ||
shell.py | ||
StartPage.py | ||
sugar | ||
WindowManager.py |
c234b7b4a3
Conflicts: sugar/presence/Buddy.py |
||
---|---|---|
.. | ||
session | ||
__init__.py | ||
Makefile.am | ||
Owner.py | ||
PresenceWindow.py | ||
shell.py | ||
StartPage.py | ||
sugar | ||
WindowManager.py |