diff options
| author | Emanuele Aina <em@nerd.ocracy.org> | 2007-07-04 14:14:32 +0000 |
|---|---|---|
| committer | Emanuele Aina <em@nerd.ocracy.org> | 2007-07-04 14:14:32 +0000 |
| commit | ea5ac2cb3d6965132b784e6fd608b30900f991fa (patch) | |
| tree | cd0deef6bebba2f0350486c9ab44c458ad274d92 /Makefile.am | |
| parent | 5716d5963bb82426346050d81fff7d77bac4f9ea (diff) | |
| download | telepathy-salut-ea5ac2cb3d6965132b784e6fd608b30900f991fa.tar.gz | |
Resolved some conflicts
20070704141432-f974e-a353e5e778760a7739a9865311e4d9ad7d5a1003.gz
Diffstat (limited to 'Makefile.am')
0 files changed, 0 insertions, 0 deletions