sugar-toolkit-gtk3/shell/view
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
..
devices
frame
home
__init__.py
ActivityHost.py
BuddyIcon.py
BuddyMenu.py
clipboardicon.py
clipboardmenu.py
keyhandler.py
Makefile.am
OverlayWindow.py
pulsingicon.py
Shell.py