[mcomix: 6/6] fix conflict

Mamoru Tasaka mtasaka at fedoraproject.org
Tue Jan 15 13:54:16 UTC 2013

Previous message: [mcomix: 5/6] Don't import Image directly and import PIL instead for
Next message: [mediatomb] Autoconfig fixes.
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

commit 4ce5a188e0b26a9143edc0d008b6e32cee91de23
Merge: 2ca72a2 802f258
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Tue Jan 15 22:53:27 2013 +0900

    fix conflict

---

Previous message: [mcomix: 5/6] Don't import Image directly and import PIL instead for
Next message: [mediatomb] Autoconfig fixes.
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

More information about the scm-commits mailing list