diff options
| author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2007-11-09 16:38:09 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2007-11-09 16:38:09 (GMT) |
| commit | d577566151c7dd7287d5609730861b006158b1e4 (patch) | |
| tree | 99feac57c9b782657c1aef755e58939e26d93895 /NEWS | |
| parent | bdfbe8d6731d2350bbfccbf24f7931ef2ce20660 (diff) | |
| parent | 213259233d27d2b83747a42dfc9e2f3bfdbae07c (diff) | |
Merge branch 'master' of git+ssh://marco@dev.laptop.org/git/sugar
Conflicts:
NEWS
Diffstat (limited to 'NEWS')
| -rw-r--r-- | NEWS | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -1,4 +1,6 @@ * #4687 Use the right free function, fix a crash. (sjoerd) +* #4724 Display meshbox invite palette menu with colored + activity icon (erikos) * Always checkin to the DS from a new file. (tomeu) Snapshot c682a5e241 |