Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

This commit is contained in:
Dan Williams 2007-07-24 18:29:22 -04:00
commit c5d0a3fab6

2
NEWS
View File

@ -1,3 +1,5 @@
Snapshot 9ac5d38e90
* #2361 Ensure secondary palette state doesn't go out of screen. (marco)
* #2014 Use a combobox to represent activity network state. (marco)