Merge branch 'releases/2.2.0' into next

This commit is contained in:
Tim Moore 2011-02-16 16:54:35 +01:00
commit 3a0fbae4d9

View File

@ -20,8 +20,7 @@
#include <simgear/structure/OSGVersion.hxx> #include <simgear/structure/OSGVersion.hxx>
#define SG_PAGEDLOD_HAS_OPTIONS \ #define SG_PAGEDLOD_HAS_OPTIONS \
(SG_OSG_VERSION >= 29005 \ (SG_OSG_VERSION >= 29005)
|| (SG_OSG_VERSION < 29000 && SG_OSG_VERSION >= 28003))
#include <osg/PagedLOD> #include <osg/PagedLOD>
#include <osgDB/Registry> #include <osgDB/Registry>