nojhan/paradiseo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of git+ssh://canape@scm.gforge.inria.fr//gitroot/paradiseo/paradiseo.git

Browse source
This commit is contained in:
canape 2013-02-06 08:15:03 +01:00
commit 0c35ff4859
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
.gitignore vendored
View file

@ -15,10 +15,17 @@
!CMakeLists.txt !CMakeLists.txt
!README.txt !README.txt
!application/ !application/
!build/
!doc/ !doc/
!lib/ !lib/
!src/ !src/
!test/ !test/
!eompi.html !eompi.html
# ignore built files
build/ build/
release/*
debug/*
build/*
website/EO_star.png
website/paradiseo_logo.png

2
smp/src/smp.h
View file

@ -48,7 +48,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#include <topology/ring.h> #include <topology/ring.h>
#include <topology/star.h> #include <topology/star.h>
#include <topology/hypercubic.h> #include <topology/hypercubic.h>
#include <topology/mesh.cpp> #include <topology/mesh.h>
#include <topology/customBooleanTopology.h> #include <topology/customBooleanTopology.h>
#include <topology/customBooleanTopology.h> #include <topology/customBooleanTopology.h>