Merging in the latest master

This commit is contained in:
Jason Hooks 2012-06-11 13:25:06 -04:00
parent 447158e9d6
commit b14c132a31

View file

@ -16,10 +16,10 @@ namespace MWGui
SettingsWindow(WindowManager& parWindowManager); SettingsWindow(WindowManager& parWindowManager);
private: private:
static const float sFovMin = 30; static int const sFovMin = 30;
static const float sFovMax = 140; static int const sFovMax = 140;
static const float sViewDistMin = 2000; static int const sViewDistMin = 2000;
static const float sViewDistMax = 5600; static int const sViewDistMax = 5600;
protected: protected:
MyGUI::Button* mOkButton; MyGUI::Button* mOkButton;