1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-29 15:36:41 +00:00

Merge remote branch 'edmondo/master'

This commit is contained in:
Marc Zinnschlag 2012-08-05 00:03:16 +02:00
commit f5ee5a5414
3 changed files with 4 additions and 0 deletions

View file

@ -2,6 +2,8 @@
#include <OgreTerrain.h> #include <OgreTerrain.h>
#include <stdexcept>
#include <extern/shiny/Main/Factory.hpp> #include <extern/shiny/Main/Factory.hpp>
namespace namespace

View file

@ -1,4 +1,5 @@
#include "esm_reader.hpp" #include "esm_reader.hpp"
#include <stdexcept>
namespace ESM namespace ESM
{ {

View file

@ -36,6 +36,7 @@
#include <stdexcept> #include <stdexcept>
#include <vector> #include <vector>
#include <cassert> #include <cassert>
#include <stdint.h>
#include "record.hpp" #include "record.hpp"
#include "nif_types.hpp" #include "nif_types.hpp"