diff options
| author | Marc Maurer <uwog@uwog.net> | 2007-05-28 19:18:56 (GMT) |
|---|---|---|
| committer | Marc Maurer <uwog@uwog.net> | 2007-05-28 19:18:56 (GMT) |
| commit | 9ba6b821e9acf2558c53334c779c0da9ef5d4836 (patch) | |
| tree | 2fc018e8fc0a9db7debd43f55874b95515d68780 /setup.py | |
| parent | d79fad4a0364f951ddd8ae4c3ee3d5813f06d892 (diff) | |
| parent | 1a35837b2e33407a62909d6a2fc7884df7fe9f28 (diff) | |
Fix merge
Merge branch 'master' of git+ssh://dev.laptop.org/git/projects/write
Conflicts:
AbiWordActivity.py
activity/activity.info
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions