diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-09-10 15:22:04 (GMT) |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-09-10 15:22:04 (GMT) |
| commit | 8089a9c4918854d0617fc2b785c604108ad53136 (patch) | |
| tree | 6c97029e8b54edb1c84de52ea08aacee698294cf | |
| parent | c7b7d925ecaaaeda337a564d85219986d6c64e8f (diff) | |
| parent | 687e7b31844c703cf5d8957214140b9652815464 (diff) | |
Merge branch 'master' of git+ssh://dev.laptop.org/git/projects/presence-service
Conflicts:
NEWS
| -rw-r--r-- | NEWS | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -1,5 +1,8 @@ * When a buddy goes offline, consider them to have left all their activities (smcv) + +Snapshot 3ed091301b + * Improve tracking of who's in activities with us (smcv) * Refactor joining/sharing so we don't claim to have succeeded, or try to SetProperties(), until we're actually in the chatroom |