Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Conflicts: NEWS
This commit is contained in:
@@ -1,4 +1,8 @@
|
||||
* Activity launching now timeout after 120 seconds. (marco)
|
||||
* Add timeout arg to sugar.datastore.Datastore. (tomeu)
|
||||
* Turn off logging by default. Logs may be re-enabled on a per-module basis
|
||||
by adding environment variables like SHELL_DEBUG and RECORD_DEBUG to
|
||||
the sugar environment
|
||||
|
||||
Snapshot 088c7612e3
|
||||
|
||||
|
||||
Reference in New Issue
Block a user