jasper 225abed6b2 add conflict markers with py-Pillow.		2013-02-04 07:55:26 +00:00
..
patches	- update py-Imaging to 1.17, from Alexander Shadchin	2010-11-15 20:57:10 +00:00
pkg	add conflict markers with py-Pillow.	2013-02-04 07:55:26 +00:00
distinfo	- update py-Imaging to 1.17, from Alexander Shadchin	2010-11-15 20:57:10 +00:00
Makefile	add conflict markers with py-Pillow.	2013-02-04 07:55:26 +00:00