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

Conflicts: NEWS
2007-10-31 11:58:44 +00:00
parent 2e86ad91b9 dbbdf7383f
commit b0c7a0546d
17 changed files with 609 additions and 240 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)