merging

Former-commit-id: 4979525cdcd4d9e023c4e0910b9a273e29fef0b2

include/igl/matlab/Makefile

@@ -22,7 +22,7 @@ INC+=$(EIGEN3_INC)
 
 # Matlab dependency
 ifndef MATLAB
-  MATLAB=/Applications/MATLAB_R011b.app/
+  MATLAB=/Applications/MATLAB_R2012a.app/
   $(warning MATLAB undefined. Setting MATLAB=${MATLAB})
 endif
 MATLAB_INC=-I$(MATLAB)/extern/include/