Merge branch 'next' of git.gitorious.org:fg/simgear into next

This commit is contained in:
Martin Spott 2011-09-09 18:13:12 +02:00
commit b204b3c8eb
2 changed files with 7 additions and 0 deletions

View File

@ -5,6 +5,9 @@
#include <cassert> #include <cassert>
#include <cstring> #include <cstring>
// working around MSVC weirdness with props.hxx and SGMathFwd
#include <simgear/math/SGMath.hxx>
#include "propertyObject.hxx" #include "propertyObject.hxx"
#include <simgear/structure/exception.hxx> #include <simgear/structure/exception.hxx>

View File

@ -6,6 +6,10 @@
#include <simgear/compiler.h> #include <simgear/compiler.h>
#include <iostream> #include <iostream>
// working around MSVC weirdness with props.hxx and SGMathFwd
#include <simgear/math/SGMath.hxx>
#include "props.hxx" #include "props.hxx"
#include "props_io.hxx" #include "props_io.hxx"