conflict resolved

This commit is contained in:
Johann Dreo 2012-07-23 16:05:10 +02:00
commit 16b27b4626
9 changed files with 916 additions and 53 deletions

View file

@ -4,5 +4,6 @@ mkdir -p release
cd release
cmake -DWITH_EIGEN=1 ..
#cmake -DWITH_BOOST=1 ..
make
cd ..