Merge branch 'master' into water

This commit is contained in:
scrawl 2012-04-06 20:58:50 +02:00
commit 50702c5e84

View file

@ -70,7 +70,7 @@ namespace MWInput
};
// Class that handles all input and key bindings for OpenMW
class InputImpl : public Ogre::FrameListener
class InputImpl
{
OEngine::Input::DispatcherPtr disp;
OEngine::Render::OgreRenderer &ogre;