Merge branch 'timoore/effects'

Conflicts:
	simgear/scene/model/model.cxx
	simgear/scene/sky/newcloud.cxx
This commit is contained in:
Tim Moore
2009-12-20 16:07:00 +01:00
54 changed files with 3708 additions and 965 deletions
+1 -1
View File
@@ -37,7 +37,7 @@ AC_PROG_CXX
AC_PROG_RANLIB
AC_PROG_INSTALL
AC_PROG_LN_S
AX_BOOST_BASE([1.34.0])
AX_BOOST_BASE([1.37.0])
if test "x$BOOST_CPPFLAGS" != "x-I/usr/include" ; then
CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"