diff options
author | Marco Pesenti Gritti <mpg@redhat.com> | 2007-09-24 19:08:26 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <mpg@redhat.com> | 2007-09-24 19:08:26 (GMT) |
commit | 9b68754ba5c1f63d7ca6adfee3ef6114628c175e (patch) | |
tree | 351767f819241965d51f7d5aeb600d3226c12bee /data/Makefile.am | |
parent | 90bf68d0f3a7f96561dfe22c46721db585f4bdc9 (diff) | |
parent | e3f97b042f2ffddcef8d10ae6d9bd3cb4f6c19c1 (diff) |
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Conflicts:
NEWS
Diffstat (limited to 'data/Makefile.am')
0 files changed, 0 insertions, 0 deletions