Marc Zinnschlag b157273cd9 Merge branch 'next' ...

Conflicts:
	apps/openmw/main.cpp

2011-07-31 19:28:12 +02:00

..

collections.cpp

changed engine class to support multiple data directories for esm files

2011-05-05 19:32:42 +02:00

collections.hpp

changed engine class to support multiple data directories for esm files

2011-05-05 19:32:42 +02:00

multidircollection.cpp

boost filesystem fix

2011-05-10 09:32:47 +02:00

multidircollection.hpp

more cleanup

2011-06-15 22:33:31 +02:00

path.cpp

removed a leftover debug message

2011-06-26 21:29:22 +02:00

path.hpp

adjusted components/files namespace; some related cleanup

2011-04-28 09:56:50 +02:00