sthen 1fd7849123 - pdfjam and texlive base conflict because texlive now includes the pdfjam ... scripts. add @conflict marker to texlive and remove/unlink pdfjam. - add missing @man annotation in texmf conflict noted by naddy@. ok ajacoutot@ espie@		2012-01-31 14:15:57 +00:00
..
patches	update to texlive-2011, OK kili@	2011-11-23 12:00:45 +00:00
pkg	- pdfjam and texlive base conflict because texlive now includes the pdfjam	2012-01-31 14:15:57 +00:00
distinfo	update to texlive-2011, OK kili@	2011-11-23 12:00:45 +00:00
Makefile	- pdfjam and texlive base conflict because texlive now includes the pdfjam	2012-01-31 14:15:57 +00:00