diff options
| author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2007-06-25 12:33:54 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2007-06-25 12:33:54 (GMT) |
| commit | f85142bdc48a01d1de11a192143aaf48bf087dd0 (patch) | |
| tree | db2ea581f55039f8c2449ee3074a96c8443f0caf /sugar/activity | |
| parent | e0793ef199c22faad4ead6755452535e0bf00a16 (diff) | |
| parent | 0baac89a6109fdbda904d37edfef0305fb36fe33 (diff) | |
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Conflicts:
shell/view/home/HomeBox.py
Diffstat (limited to 'sugar/activity')
0 files changed, 0 insertions, 0 deletions