Marc Zinnschlag bc92b7b1fa Merge branch 'directories' into next ... Conflicts: components/files/multidircollection.hpp components/nifogre/ogre_nif_loader.hpp		2011-06-15 22:40:24 +02:00
..
tests	Converted all tabs to four spaces	2011-01-05 22:18:21 +01:00
ogre_nif_loader.cpp	Merge branch 'directories' into next	2011-06-15 22:40:24 +02:00
ogre_nif_loader.hpp	Merge branch 'directories' into next	2011-06-15 22:40:24 +02:00