2 Commits

Author	SHA1	Message	Date
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
jasper	4a17557cbc	import tree 0.61 ... The tree utility displays a small formatted tree of directories. It can be really useful to get a quick glance of a directory structure. submitted by Pierre-Yves Ritschard <pierre-yves at spootnik.org> ok steven@	2006-06-26 18:09:00 +00:00