Merge remote branch 'osp/only-directories' into homeworkhomework
commit285ba902a38729a35d9f05696de0397bc2db49de
authorMichal Pantucek <pantumic@fel.cvut.cz>
Thu, 10 Mar 2011 13:17:55 +0000 (10 14:17 +0100)
committerMichal Pantucek <pantumic@fel.cvut.cz>
Thu, 10 Mar 2011 13:17:55 +0000 (10 14:17 +0100)
tree6f7b70a05cea49a7c3819dc04174390bcf326f31
parentbc3c848ab10e4ea7556536ad8c095d0c86c3af6d
parent597d97ef8b8c7bc0f695b482074471a69ee1afd1
Merge remote branch 'osp/only-directories' into homework

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