Merge commit 'osp/only-directories' into homework
commitd9c1b534b72c0a976206f99a878c15f938e38de9
authorPavel Micka <mickapa1@fel.cvut.cz>
Thu, 11 Mar 2010 10:11:25 +0000 (11 11:11 +0100)
committerPavel Micka <mickapa1@fel.cvut.cz>
Thu, 11 Mar 2010 10:11:25 +0000 (11 11:11 +0100)
tree53188479aa0088dffb2e97374ed3282c29b97ada
parent6f76ccac0381551d8f4b0fa2acc2936c12145211
parentf3f39f8bf862aa0ec4f76763e67dc4049682a8b7
Merge commit 'osp/only-directories' into homework

Conflicts:
src/find.c
doc/man/mc.1.in
src/find.c