removing embree from external

Former-commit-id: 2999ce5b82482ae53e7d08ec9b4c2a343d12d837

.hgignore

@@ -16,6 +16,7 @@ external/yimg/.git*
 external/tinyxml2/CMakeFiles*
 external/tinyxml2/CMakeCache.txt
 external/embree/bin/*
+external/embree/bin
 external/embree/doc/html/*
 external/embree/doc/latex/*
 *.cmake

examples/patches/Makefile

@@ -20,8 +20,19 @@ ANTTWEAKBAR_INC=-I$(LIBIGL)/external/AntTweakBar/include
 ANTTWEAKBAR_LIB=-L$(LIBIGL)/external/AntTweakBar/lib -lAntTweakBar -framework AppKit
 
 EMBREE=$(LIBIGL)/external/embree
+<<<<<<< local
+<<<<<<< local
+EMBREE_INC=-I$(EMBREE)/rtcore -I$(EMBREE)/common
+EMBREE_LIB=-L$(EMBREE)/bin -lrtcore -lsys
+=======
+=======
+>>>>>>> other
 EMBREE_INC=-I$(EMBREE)/ -I$(EMBREE)/embree
 EMBREE_LIB=-L$(EMBREE)/bin -lembree -lsys
+<<<<<<< local
+>>>>>>> other
+=======
+>>>>>>> other
 
 MATLAB_INC=-I$(MATLAB)/extern/include/
 MATLAB_LIB=-L$(MATLAB)/bin/maci64 -lmx -lmat -lmex -lstdc++