Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Conflicts: NEWS
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user