diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-05-16 11:30:49 (GMT) |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-05-16 11:30:49 (GMT) |
| commit | 531321740cbf6bd971ce73dbfea2bb83a4d64566 (patch) | |
| tree | 4f8a96813e1045edb81f2bd7e2e57bfcd3d19688 /sugar/graphics/combobox.py | |
| parent | 35d190b55e49aabcf7d9727cf3d44147451f4434 (diff) | |
| parent | 5d9e19a8921dc187a88a43d4e5407a289b32bc06 (diff) | |
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Conflicts:
services/presence/server_plugin.py
Diffstat (limited to 'sugar/graphics/combobox.py')
0 files changed, 0 insertions, 0 deletions