Dan Williams 86c3e9d1b0 Another merge fix

2006-07-07 11:49:56 -04:00

..

google

…

session

…

__init__.py

…

ActivityContainer.py

Another merge fix

2006-07-07 11:49:56 -04:00

ActivityHost.py

…

ConsoleLogger.py

Rewrite the wm, implement smarter sliding, "merge"

2006-07-07 16:37:52 +02:00

Makefile.am

…

Owner.py

…

PresenceWindow.py

…

shell.py

Fix activity double-join bug where opening a shared activity twice opened a blank tab

2006-07-07 11:00:20 -04:00

Shell.py

Rewrite the wm, implement smarter sliding, "merge"

2006-07-07 16:37:52 +02:00

StartPage.py

Remove merge conflict junk

2006-07-07 11:03:34 -04:00

sugar

…

WindowManager.py

Ensure we are not overwflowing target position

2006-07-07 17:18:21 +02:00