Nikolay Kasyanov 58add97676 Merge branch 'master' into osx-ogre-19 ... Conflicts: CMakeLists.txt		2014-02-13 20:34:06 +04:00
..
ogreinit.cpp	Fix incorrect log file name for launcherOgre.log	2013-12-03 15:56:00 +01:00
ogreinit.hpp	Refactored Ogre initialisation into a component	2013-10-30 14:04:33 +01:00
ogreplugin.cpp	Merge branch 'master' into osx-ogre-19	2014-02-13 20:34:06 +04:00
ogreplugin.hpp	Refactored Ogre initialisation into a component	2013-10-30 14:04:33 +01:00