diff options
| author | Marco Pesenti Gritti <mpg@redhat.com> | 2007-10-29 14:51:35 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <mpg@redhat.com> | 2007-10-29 14:51:35 (GMT) |
| commit | 15210f4cc497da080fd00a5089dc8bf802e4ea74 (patch) | |
| tree | ab2b485e2ecb555e89d3f4efee17d6b0260bc3fc /NEWS | |
| parent | 702a89077074d57ab4c7bc8ecd770dece4d86691 (diff) | |
| parent | 18f9a0ef9251fa3fa109fe32dad7550326c35493 (diff) | |
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Conflicts:
NEWS
Diffstat (limited to 'NEWS')
| -rw-r--r-- | NEWS | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -1,4 +1,6 @@ * #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 |