Marc Zinnschlag a95a0f821b Merge remote branch 'jhooks/directories' into directories ...

Conflicts:
	components/files/multidircollection.hpp

2011-06-04 10:27:16 +02:00

..

collections.cpp

…

collections.hpp

…

multidircollection.cpp

…

multidircollection.hpp

Merge remote branch 'jhooks/directories' into directories

2011-06-04 10:27:16 +02:00

path.cpp

…

path.hpp

…