diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-10-31 11:58:44 (GMT) |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-10-31 11:58:44 (GMT) |
| commit | b0c7a0546d8aaaf81e094ad8b8083dc266ae14a4 (patch) | |
| tree | ec0da9ddc9d4255e4b4005632e8d8481ab8b0a4e /NEWS | |
| parent | 2e86ad91b92dec5c8f062adc009cec47b7236b94 (diff) | |
| parent | dbbdf7383f2c94da2135fe0855d00945eab60115 (diff) | |
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Conflicts:
NEWS
Diffstat (limited to 'NEWS')
| -rw-r--r-- | NEWS | 9 |
1 files changed, 9 insertions, 0 deletions
@@ -1,4 +1,13 @@ * #4518: Encode nickname in UTF-8 when writing it out to .sugar/*/config (smcv) +* sugar-control: Use NM for radio on/off, check for superuser (erikos) + +Snapshot b72f00e30b + +* #4517 Do not require a TakeScreenshot method on the dbus service (marco) +* Add wep type combo. (dcbw) + +Snapshot 8c89bfaed7 + * #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) |