Nikolay Kasyanov c2fe0d480a Merge remote-tracking branch 'upstream/master' into osx-ogre-19 ... Conflicts: CMakeLists.txt		2014-02-14 00:04:16 +04:00
..
ogreinit.cpp	OS X: attempt to fix #1045	2013-12-25 00:25:58 +04: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