diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-07-05 17:21:03 (GMT) |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-07-05 17:21:03 (GMT) |
| commit | 75e9f4c18969bbd5890b7a31a0d8d6c07ffff051 (patch) | |
| tree | b931d6adfd4a9cceb91bcf0783a9c3ad6e24f170 /sugar-jhbuild | |
| parent | c5216e6cc606d2559da98afcc341ac433b57474b (diff) | |
| parent | c741e4b209ecb2eb5938d5e810850e7fda1848cf (diff) | |
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar-jhbuild
Conflicts:
build-scripts/sugar-platform.modules
nothing added to commit but untracked files present (use "git add" to track)
Diffstat (limited to 'sugar-jhbuild')
0 files changed, 0 insertions, 0 deletions