diff options
| author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-07-10 12:00:06 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-07-10 12:00:06 (GMT) |
| commit | 3e30af13f6870eeee89b957a0e2e5f419c68ccaf (patch) | |
| tree | 024d6ebad796d38633ee0e921f367a8475bdd55e /.gitignore | |
| parent | e6a8860f3ee0aa890528af07c4a44bb05cbd74f6 (diff) | |
| parent | 9f9f42086333ad7fec3a2f5c0658145cd57dd992 (diff) | |
Merge design-review-3-no-tabs
Conflicts:
activities/browser/BrowserActivity.py
shell/ActivityContainer.py
shell/ActivityHost.py
shell/ConsoleLogger.py
shell/HomeWindow.py
shell/Shell.py
shell/WindowManager.py
sugar/activity/Activity.py
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions