diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-10-17 10:54:33 (GMT) |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-10-17 10:54:33 (GMT) |
commit | 4f41f300d8eec783335e95ef3b37da9f8a080b3f (patch) | |
tree | b4f7463671d419c94ebef5ff4621b6fb5196f7e9 /NEWS | |
parent | 48bc73d0c4c85bcc473052ee934c49782aba0e8c (diff) | |
parent | 16d5afb66b248ce3721838d08eb90d1f918c03cc (diff) |
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Conflicts:
NEWS
Diffstat (limited to 'NEWS')
-rw-r--r-- | NEWS | 11 |
1 files changed, 11 insertions, 0 deletions
@@ -1,4 +1,15 @@ * #4027 Try to make sugar.presence log messages less misleading (smcv) + +Snapshot 24fbd1ce1c + +* Fix the object chooser (marco) + +Snapshot 3c7578577d + +* Fix the shell service (marco) + +Snapshot fa55b5af09 + * Changed default spacing to 15px (from 8px) (benzea) * Correct the height of the primary palette (benzea) * Use double leading underscores for callback names to avoid name collisions (erikos) |