diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-10-30 12:38:32 (GMT) |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-10-30 12:38:32 (GMT) |
| commit | 4391d4777ad9d42d0cd6c193699ab7a1ec585a37 (patch) | |
| tree | fbf913532bc494b610b49be23c7cb879675fdaa6 /NEWS | |
| parent | 249521253dfc61248a22133c6624225234515eb5 (diff) | |
| parent | 6768a4216fad97711faeeffcfa9c43e8adc8491b (diff) | |
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Conflicts:
NEWS
Diffstat (limited to 'NEWS')
| -rw-r--r-- | NEWS | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -1,5 +1,12 @@ * #4503: Do some standard Tubes boilerplate in sugar.presence, so activities don't have to (smcv) +* #4428 Revert to the trial-3 frame behavior (marco) +* Initial push for the sugar control panel (erikos) +* #4358: pydoc strings for sugar.activity.Activity + +Snapshot 176262f2e9 + +* Added morgs NotifyAlert (timed one button alert) to the alert api (erikos) Snapshot fdb4e49b14 |