Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-05-01 14:27:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 31

Merge remote-tracking branch 'zini/master' into animation2

Browse source
This commit is contained in:
Chris Robinson 2013-02-22 01:34:22 -08:00
commit 3c0b29de45
5 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/bsa/bsa_file.cpp
View file

@ -23,9 +23,7 @@
#include "bsa_file.hpp"
//#include <stdexcept>
//#include <cstdlib>
//#include <cassert>
#include <stdexcept>
#include "../files/constrainedfiledatastream.hpp"

2
components/nif/nif_file.cpp
View file

@ -37,7 +37,7 @@
//TODO: when threading is needed, enable these
//#include <boost/mutex.hpp>
//#include <boost/thread/locks.hpp>
#include <boost/thread/locks.hpp>
namespace Nif
{