Merge branch 'master' of git://github.com/OpenMW/openmw into appveyor

9 years ago · d3da51bbb2
parent d32358558e a7c886721c
commit d3da51bbb2
3 changed files with 3 additions and 3 deletions
--- a/apps/openmw/mwworld/timestamp.cpp
+++ b/apps/openmw/mwworld/timestamp.cpp
@ -96,7 +96,7 @@ namespace MWWorld
        if (left.getHour()<right.getHour())
        {
            hours = 24-right.getHour()+left.getHour();
-            ++days;
+            --days;
        }
        else
        {
--- a/components/resource/objectcache.cpp
+++ b/components/resource/objectcache.cpp
@ -13,7 +13,7 @@

 #include <osg/Version>

-#if OSG_VERSION_LESS_THAN(3,4,0)
+#if OSG_VERSION_LESS_THAN(3,3,3)

 #include "objectcache.hpp"

--- a/components/resource/objectcache.hpp
+++ b/components/resource/objectcache.hpp
@ -19,7 +19,7 @@

 #include <osg/Version>

-#if OSG_VERSION_GREATER_OR_EQUAL(3,4,0)
+#if OSG_VERSION_GREATER_OR_EQUAL(3,3,3)
 #include <osgDB/ObjectCache>
 #else