merge with default branch

This commit is contained in:
Gael Guennebaud
2014-07-02 09:35:37 +02:00
123 changed files with 250 additions and 12233 deletions

View File

@@ -536,7 +536,6 @@ MatrixBase<Derived>::partialPivLu() const
}
#endif
#if EIGEN2_SUPPORT_STAGE > STAGE20_RESOLVE_API_CONFLICTS
/** \lu_module
*
* Synonym of partialPivLu().
@@ -554,8 +553,6 @@ MatrixBase<Derived>::lu() const
}
#endif
#endif
} // end namespace Eigen
#endif // EIGEN_PARTIALLU_H