diff options
| author | Marius Kintel <marius@kintel.net> | 2012-01-09 02:29:24 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-01-09 02:29:24 (GMT) |
| commit | 23f6b0623c86eba96dfb1296b862522cf02b0734 (patch) | |
| tree | 998500ef16763f6f08f9f7cb8917c98b1643af68 /src/polyset.cc | |
| parent | 52dfffd97ba49b603b4814d843cd9be08d040364 (diff) | |
| parent | 5044ea928d72da800d11b2b80f6148265c13d10f (diff) | |
Merge branch 'master' into threading
Conflicts:
RELEASE_NOTES
Diffstat (limited to 'src/polyset.cc')
| -rw-r--r-- | src/polyset.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/polyset.cc b/src/polyset.cc index 7e40eac..778201b 100644 --- a/src/polyset.cc +++ b/src/polyset.cc @@ -27,7 +27,6 @@ #include "polyset.h" #include "linalg.h" #include <Eigen/LU> -#include <QColor> /*! /class PolySet |