Explorar o código

Merge commit '2482eaadbab338b66cf94ddf90ea49e6b9282609 [formerly 3c1e35d568b815038eae2d94de1ba128932873fd]'

Conflicts:
	include/igl/slice.cpp

Former-commit-id: 6cbc313d50605f4f9d8f3a8f481afab622d4e45a
Daniele Panozzo %!s(int64=10) %!d(string=hai) anos
pai
achega
417dd37b43

+ 1 - 1
README.md

@@ -65,7 +65,7 @@ If you save this in `hello.cpp`, then you could compile this with (assuming
 Eigen is installed in `/usr/local/include/eigen3`):
 
 ```bash
-gcc -I/usr/local/include/eigen3 -I./libigl/include/ hello.cpp -o hello
+g++ -std=c++11 -I/usr/local/include/eigen3 -I./libigl/include/ hello.cpp -o hello
 ```
 
 Running `./hello` would then produce

+ 1 - 1
libigl-logo.ai.REMOVED.git-id

@@ -1 +1 @@
-2e28a844cc4816cdb363bc90d54f37dfa1a0a9e0
+1bd069dc597f054c2d4d8c93d9eb6a671b119c86

+ 1 - 1
libigl-teaser.pdf.REMOVED.git-id

@@ -1 +1 @@
-e3cd39bc873032bb79fbeb7608aa1e08aba4eac2
+6d633e0a6c52bd9130db774013a00a5dbe7adeb6

+ 1 - 1
libigl-teaser.png.REMOVED.git-id

@@ -1 +1 @@
-a946fc13d18614f2696a1ed94978ab61e76a722b
+9bcc46445af9bf39049eca841aa080838c2ee837

BIN=BIN
tutorial/images/libigl-logo.jpg


+ 1 - 0
tutorial/images/libigl-logo.jpg.REMOVED.git-id

@@ -0,0 +1 @@
+c55d7d3d54e0d078c021f187cfe0bc8e2c40a526