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
..
2010-11-20 09:48:38 +00:00
2011-09-16 11:13:37 +00:00
2007-10-26 21:49:00 +00:00
2011-09-16 11:13:37 +00:00
2011-09-16 11:13:37 +00:00
2010-10-24 20:58:58 +00:00
2011-03-31 08:32:26 +00:00
2010-11-20 09:48:38 +00:00
2010-11-20 09:48:38 +00:00
2010-11-20 09:48:38 +00:00
2010-11-20 09:48:38 +00:00
2011-09-16 11:13:37 +00:00
2011-12-04 17:43:54 +00:00
2011-09-16 11:13:37 +00:00
2011-11-16 12:43:23 +00:00
2010-11-20 09:48:38 +00:00
2011-09-16 11:13:37 +00:00
2011-05-04 14:55:02 +00:00
2012-01-17 09:54:27 +00:00
2010-11-20 09:48:38 +00:00
2010-11-20 09:48:38 +00:00
2010-11-20 09:48:38 +00:00
2010-11-20 09:48:38 +00:00
2011-09-16 11:13:37 +00:00
2011-09-16 11:13:37 +00:00
2011-09-16 11:13:37 +00:00
2010-10-18 21:25:07 +00:00
2010-11-20 09:48:38 +00:00
2010-11-20 09:48:38 +00:00
2011-09-16 11:13:37 +00:00
2011-12-10 22:04:12 +00:00
2010-11-23 21:26:46 +00:00
2010-11-20 09:48:38 +00:00
2011-12-04 16:56:45 +00:00
2011-09-16 11:13:37 +00:00
2011-09-16 11:13:37 +00:00
2011-09-16 11:13:37 +00:00
2011-07-08 20:36:09 +00:00
2010-07-17 07:59:37 +00:00