conflict resolved

This commit is contained in:
Pierre Savéant 2012-07-23 16:21:52 +02:00
commit 72a045a60b

View file

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