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

Conflicts:

	shell/view/home/HomeBox.py

2007-06-25 14:33:54 +02:00

..

__init__.py

Add a bunch of GPL headers

2007-06-24 15:01:30 +02:00

activitiesdonut.py

…

FriendsBox.py

…

FriendView.py

…

HomeBox.py

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

2007-06-25 14:33:54 +02:00

HomeWindow.py

…

Makefile.am

…

MeshBox.py

…

MyIcon.py

…

transitionbox.py

…