Merge remote branch 'osp/only-directories'master
commit5a54abe4e86bfdad97b5d544c1b03bb341e1127f
authorRadu Fiser <radu.fiser@gmail.com>
Fri, 12 Mar 2010 22:48:15 +0000 (13 00:48 +0200)
committerRadu Fiser <radu.fiser@gmail.com>
Fri, 12 Mar 2010 22:48:15 +0000 (13 00:48 +0200)
tree68d0ea0496d4b4a0625132f991aef4a81a3a6e5a
parentb5a155988e87136be8a41489b1620736a0d2722f
parentf3f39f8bf862aa0ec4f76763e67dc4049682a8b7
Merge remote branch 'osp/only-directories'

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