Merge remote branch 'osp/only-directories'homework
commitb9b8c9dc4e833825993dd82b4775e792ed7bf83f
authorTomas Rehorek <rehorto2@fel.cvut.cz>
Tue, 27 Apr 2010 20:53:48 +0000 (27 22:53 +0200)
committerTomas Rehorek <rehorto2@fel.cvut.cz>
Tue, 27 Apr 2010 20:53:48 +0000 (27 22:53 +0200)
tree9869f48fdb51266b35942cc96bd1a5dabed5f9d7
parentf1bdb46dd37dfc5ccf653bb4fee0765a7a0d9d8b
parentf3f39f8bf862aa0ec4f76763e67dc4049682a8b7
Merge remote branch 'osp/only-directories'

Conflicts:
src/find.c
src/find.c
src/find.c.orig