Dan Williams 70965d0344 Remove merge conflict junk

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

..

google

…

session

Split classes out of shell.py

2006-07-06 23:34:23 +02:00

__init__.py

…

ActivityContainer.py

Rewrite the wm, implement smarter sliding, "merge"

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

ActivityHost.py

Forgot to add these

2006-07-06 23:35:16 +02:00

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

Rewrite the wm, implement smarter sliding, "merge"

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