Marco Pesenti Gritti 9b68754ba5 Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar ...

Conflicts:

	NEWS

2007-09-24 21:08:26 +02:00

..

__init__.py

…

activitiesdonut.py

Rework home box layout to fix #2665.

2007-09-24 21:07:43 +02:00

FriendsBox.py

Use nick name consistently in the profile

2007-09-17 16:28:21 +02:00

FriendView.py

…

HomeBox.py

Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

2007-09-24 21:08:26 +02:00

HomeWindow.py

…

Makefile.am

…

MeshBox.py

…

MyIcon.py

…

proc_smaps.py

…

snowflakelayout.py

…

transitionbox.py

…