Merge branch 'master' of https://github.com/libigl/libigl

Conflicts:
	include/igl/slice.cpp

Former-commit-id: b7d875e36da708493eed190a871fed4eff45f818

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

include/igl/slice.cpp

@@ -8,10 +8,8 @@
 #include "slice.h"
 #include "colon.h"
 
-#include <unsupported/Eigen/SparseExtra>
-#include <Eigen/Sparse>
 #include <vector>
-#include <complex>
+#include <unsupported/Eigen/SparseExtra>
 
 template <typename T>
 IGL_INLINE void igl::slice(
@@ -82,7 +80,7 @@ IGL_INLINE void igl::slice(
   // handled here (although it's not clear if there is a performance gain when
   // the #removals >> #remains). If this is sufficiently faster than the
   // correct code above, one could test whether all entries in R and C are
-  // unique and apply the permutation version if appropriate.
+  // unique and apply the permutation version if appropriate. 
   //
 
   int xm = X.rows();

libigl-logo.ai.REMOVED.git-id

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

libigl-teaser.pdf.REMOVED.git-id

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

libigl-teaser.png.REMOVED.git-id

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

tutorial/images/libigl-logo.jpg.REMOVED.git-id

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