diff options
author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2007-05-21 10:47:28 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2007-05-21 10:47:28 (GMT) |
commit | 17b31427765d21591986b927955f6f5342201d82 (patch) | |
tree | 6848e43c192ec8411b0e4f87a1d8b6d9086de9ba /Makefile.am | |
parent | f1d67f661e22150381886784d80c79e0db542e17 (diff) | |
parent | 8c8dffe662b9b2491eed2e553e3165c827f1c3cc (diff) |
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Conflicts:
configure.ac
Diffstat (limited to 'Makefile.am')
0 files changed, 0 insertions, 0 deletions