mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-01 13:20:29 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alexander "Ace" Olofsson 2015-12-26 00:30:51 +01:00
commit d3da51bbb2
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/openmw/mwworld/timestamp.cpp
View File

@ -96,7 +96,7 @@ namespace MWWorld
if (left.getHour()<right.getHour()) if (left.getHour()<right.getHour())
{ {
hours = 24-right.getHour()+left.getHour(); hours = 24-right.getHour()+left.getHour();
++days; --days;
} }
else else
{ {

2
components/resource/objectcache.cpp
View File

@ -13,7 +13,7 @@
#include <osg/Version> #include <osg/Version>
#if OSG_VERSION_LESS_THAN(3,4,0) #if OSG_VERSION_LESS_THAN(3,3,3)
#include "objectcache.hpp" #include "objectcache.hpp"

2
components/resource/objectcache.hpp
View File

@ -19,7 +19,7 @@
#include <osg/Version> #include <osg/Version>
#if OSG_VERSION_GREATER_OR_EQUAL(3,4,0) #if OSG_VERSION_GREATER_OR_EQUAL(3,3,3)
#include <osgDB/ObjectCache> #include <osgDB/ObjectCache>
#else #else