bernd 9b0c253c15 Add @conflict markers for the following conflicts: ... devtodo-0.1.17p1,openmotif-demos-2.3.0 /usr/local/bin/todo gnokii-0.6.14p2,gnokii-0.6.14p2-no_x11,smstools-3.0.9 /usr/local/bin/sendsms openmotif-demos-2.3.0,tree-0.61 /usr/local/bin/tree ok espie@		2007-08-03 17:42:45 +00:00
..
bruce	more base64 checksums	2007-04-05 17:26:05 +00:00
devtodo	Add @conflict markers for the following conflicts:	2007-08-03 17:42:45 +00:00
gnucash	mark broken, this port badly needs an update.	2007-05-31 15:52:28 +00:00
grisbi	more base64 checksums	2007-04-05 17:26:05 +00:00
gtimer	more base64 checksums	2007-04-05 17:26:05 +00:00
ledger	more base64 checksums	2007-04-05 17:26:05 +00:00
qhacc	USE_X11 = Yes	2007-07-13 08:53:47 +00:00
siag	more base64 checksums	2007-04-05 17:26:05 +00:00
taskjuggler	Don't depend on the qt3 'mt' FLAVOR. This FLAVOR doesn't do anything	2007-05-09 11:31:43 +00:00
tdl	more base64 checksums	2007-04-05 17:26:05 +00:00
vym	Import vym-1.8.1	2007-07-07 17:59:05 +00:00
workrave	import workrave 1.8.4.2	2007-07-16 14:24:57 +00:00
wyrd	more base64 checksums	2007-04-05 17:26:05 +00:00
xinvest	make DESCR descriptive	2007-05-20 14:32:45 +00:00
xquote	make DESCR descriptive; noticed by espie@	2007-05-20 14:07:12 +00:00
Makefile	add workrave	2007-07-16 14:25:43 +00:00