change *.xbm to *.png
	deleted:    AddisonWesley.html
	deleted:    Empty.html
	deleted:    FrontMatter.html
	deleted:    Gray.html
	deleted:    ImpGuide.html
	deleted:    ImpGuide/01_Overview.html
	deleted:    ImpGuide/02_Install.html
	deleted:    ImpGuide/03_RunProg.html
	deleted:    ImpGuide/04_CompLink.html
	deleted:    ImpGuide/05_WriteProg.html
	deleted:    ImpGuide/equations/NsubX2Prime.gif
	deleted:    ImpGuide/equations/NsubXPrime.gif
	deleted:    ImpGuide/equations/OneOverSqrt.gif
	deleted:    ImpGuide/equations/fdef1.gif
	deleted:    ImpGuide/equations/fdef2.gif
	deleted:    ImpGuide/images/3Dtex.gif
	deleted:    ImpGuide/images/Label.gif
	deleted:    ImpGuide/images/OpenGL3.gif
	deleted:    ImpGuide/images/Shadow.gif
	deleted:    ImpGuide/images/WithOutPreLight.gif
	deleted:    ImpGuide/images/WithPreLight.gif
	deleted:    ImpGuide/images/boxes_c.gif
	deleted:    ImpGuide/images/boxes_cc.gif
	deleted:    ImpGuide/images/shadow1.jpeg
	deleted:    ImpGuide/images/tex3D.gif
	deleted:    ImpGuide/images/tinaborder.gif
	deleted:    ImpGuide/images/tinaclamp.gif
	deleted:    ImpGuide/images/tinaedge.gif
	deleted:    ImpGuide/images/tinarepeat.gif
	deleted:    ImpGuide/symbols/EmDash.gif
	deleted:    ImpGuide/symbols/EmDash.xbm
	deleted:    ImpGuide/symbols/LAngle.gif
	deleted:    ImpGuide/symbols/LAngle.xbm
	deleted:    ImpGuide/symbols/RAngle.gif
	deleted:    ImpGuide/symbols/RAngle.xbm
	deleted:    ImpGuide/symbols/Times.gif
	deleted:    ImpGuide/symbols/Times.xbm
	deleted:    Index.html
	deleted:    OpenGL.html
	deleted:    README.md
	deleted:    ReaderReply.html
	deleted:    RefTOC.html
	deleted:    Reference.html
	deleted:    Reference/buttons/ArrowLeftOff.gif
	deleted:    Reference/buttons/ArrowRightOff.gif
	deleted:    Reference/buttons/ArrowUpOff.gif
	deleted:    Reference/equations/glEvalCoord_Eq1.gif
	deleted:    Reference/equations/glEvalCoord_Eq2.gif
	deleted:    Reference/equations/glMap1_Eq1.gif
	deleted:    Reference/equations/glMap1_Eq2.gif
	deleted:    Reference/equations/glMap1_Eq3.gif
	deleted:    Reference/equations/glMap1_Eq4.gif
	deleted:    Reference/equations/glMap1_uhat.gif
	deleted:    Reference/equations/glMap2_Eq1.gif
	deleted:    Reference/equations/glMap2_Eq2.gif
	deleted:    Reference/equations/glMap2_Eq3.gif
	deleted:    Reference/equations/glMap2_Eq4.gif
	deleted:    Reference/equations/glMap2_Eq5.gif
	deleted:    Reference/equations/glMap2_Eq6.gif
	deleted:    Reference/equations/glMap2_vhat.gif
	deleted:    Reference/equations/glPixelStore_Eq1.gif
	deleted:    Reference/equations/glPixelStore_Eq2.gif
	deleted:    Reference/glAccum.html
	deleted:    Reference/glAlphaFunc.html
	deleted:    Reference/glAreTexturesResident.html
	deleted:    Reference/glArrayElement.html
	deleted:    Reference/glBegin.html
	deleted:    Reference/glBindTexture.html
	deleted:    Reference/glBitmap.html
	deleted:    Reference/glBlendColorEXT.html
	deleted:    Reference/glBlendFunc.html
	deleted:    Reference/glCallList.html
	deleted:    Reference/glCallLists.html
	deleted:    Reference/glClear.html
	deleted:    Reference/glClearAccum.html
	deleted:    Reference/glClearColor.html
	deleted:    Reference/glClearDepth.html
	deleted:    Reference/glClearIndex.html
	deleted:    Reference/glClearStencil.html
	deleted:    Reference/glClipPlane.html
	deleted:    Reference/glColor.html
	deleted:    Reference/glColorMask.html
	deleted:    Reference/glColorMaterial.html
	deleted:    Reference/glColorPointer.html
	deleted:    Reference/glCopyPixels.html
	deleted:    Reference/glCopyTexImage1D.html
	deleted:    Reference/glCopyTexImage2D.html
	deleted:    Reference/glCopyTexSubImage1D.html
	deleted:    Reference/glCopyTexSubImage2D.html
	deleted:    Reference/glCopyTexSubImage3DEXT.html
	deleted:    Reference/glCullFace.html
	deleted:    Reference/glDeleteLists.html
	deleted:    Reference/glDeleteTextures.html
	deleted:    Reference/glDepthFunc.html
	deleted:    Reference/glDepthMask.html
	deleted:    Reference/glDepthRange.html
	deleted:    Reference/glDrawArraySetHP.html
	deleted:    Reference/glDrawArrays.html
	deleted:    Reference/glDrawBuffer.html
	deleted:    Reference/glDrawElements.html
	deleted:    Reference/glDrawPixels.html
	deleted:    Reference/glEdgeFlag.html
	deleted:    Reference/glEdgeFlagPointer.html
	deleted:    Reference/glEnable.html
	deleted:    Reference/glEnableClientState.html
	deleted:    Reference/glEvalCoord.html
	deleted:    Reference/glEvalMesh.html
	deleted:    Reference/glEvalPoint.html
	deleted:    Reference/glFeedbackBuffer.html
	deleted:    Reference/glFinish.html
	deleted:    Reference/glFlush.html
	deleted:    Reference/glFog.html
	deleted:    Reference/glFrontFace.html
	deleted:    Reference/glFrustum.html
	deleted:    Reference/glGenLists.html
	deleted:    Reference/glGenTextures.html
	deleted:    Reference/glGet.html
	deleted:    Reference/glGetClipPlane.html
	deleted:    Reference/glGetError.html
	deleted:    Reference/glGetLight.html
	deleted:    Reference/glGetMap.html
	deleted:    Reference/glGetMaterial.html
	deleted:    Reference/glGetPixelMap.html
	deleted:    Reference/glGetPointer.html
	deleted:    Reference/glGetPolygonStipple.html
	deleted:    Reference/glGetString.html
	deleted:    Reference/glGetTexEnv.html
	deleted:    Reference/glGetTexGen.html
	deleted:    Reference/glGetTexImage.html
	deleted:    Reference/glGetTexLevelParameter.html
	deleted:    Reference/glGetTexParameter.html
	deleted:    Reference/glHint.html
	deleted:    Reference/glIndex.html
	deleted:    Reference/glIndexMask.html
	deleted:    Reference/glIndexPointer.html
	deleted:    Reference/glInitNames.html
	deleted:    Reference/glInterleavedArrays.html
	deleted:    Reference/glIsEnabled.html
	deleted:    Reference/glIsList.html
	deleted:    Reference/glIsTexture.html
	deleted:    Reference/glLight.html
	deleted:    Reference/glLightModel.html
	deleted:    Reference/glLineStipple.html
	deleted:    Reference/glLineWidth.html
	deleted:    Reference/glListBase.html
	deleted:    Reference/glLoadIdentity.html
	deleted:    Reference/glLoadMatrix.html
	deleted:    Reference/glLoadName.html
	deleted:    Reference/glLogicOp.html
	deleted:    Reference/glMap1.html
	deleted:    Reference/glMap2.html
	deleted:    Reference/glMapGrid.html
	deleted:    Reference/glMaterial.html
	deleted:    Reference/glMatrixMode.html
	deleted:    Reference/glMultMatrix.html
	deleted:    Reference/glNewList.html
	deleted:    Reference/glNormal.html
	deleted:    Reference/glNormalPointer.html
	deleted:    Reference/glOrtho.html
	deleted:    Reference/glPassThrough.html
	deleted:    Reference/glPixelMap.html
	deleted:    Reference/glPixelStore.html
	deleted:    Reference/glPixelTransfer.html
	deleted:    Reference/glPixelZoom.html
	deleted:    Reference/glPointSize.html
	deleted:    Reference/glPolygonMode.html
	deleted:    Reference/glPolygonOffset.html
	deleted:    Reference/glPolygonStipple.html
	deleted:    Reference/glPrioritizeTextures.html
	deleted:    Reference/glPushAttrib.html
	deleted:    Reference/glPushClientAttrib.html
	deleted:    Reference/glPushMatrix.html
	deleted:    Reference/glPushName.html
	deleted:    Reference/glRasterPos.html
	deleted:    Reference/glReadBuffer.html
	deleted:    Reference/glReadPixels.html
	deleted:    Reference/glRect.html
	deleted:    Reference/glRenderMode.html
	deleted:    Reference/glRotate.html
	deleted:    Reference/glScale.html
	deleted:    Reference/glScissor.html
	deleted:    Reference/glSelectBuffer.html
	deleted:    Reference/glShadeModel.html
	deleted:    Reference/glStencilFunc.html
	deleted:    Reference/glStencilMask.html
	deleted:    Reference/glStencilOp.html
	deleted:    Reference/glTexCoord.html
	deleted:    Reference/glTexCoordPointer.html
	deleted:    Reference/glTexEnv.html
	deleted:    Reference/glTexGen.html
	deleted:    Reference/glTexImage1D.html
	deleted:    Reference/glTexImage2D.html
	deleted:    Reference/glTexImage3DEXT.html
	deleted:    Reference/glTexParameter.html
	deleted:    Reference/glTexSubImage1D.html
	deleted:    Reference/glTexSubImage2D.html
	deleted:    Reference/glTexSubImage3DEXT.html
	deleted:    Reference/glTranslate.html
	deleted:    Reference/glVertexPointer.html
	deleted:    Reference/glViewport.html
	deleted:    Reference/glXChooseVisual.html
	deleted:    Reference/glXCopyContext.html
	deleted:    Reference/glXCreateContext.html
	deleted:    Reference/glXCreateGLXPixmap.html
	deleted:    Reference/glXFreeContextEXT.html
	deleted:    Reference/glXGetClientString.html
	deleted:    Reference/glXGetConfig.html
	deleted:    Reference/glXGetContextIDEXT.html
	deleted:    Reference/glXImportContextEXT.html
	deleted:    Reference/glXIntro.html
	deleted:    Reference/glXMakeCurrent.html
	deleted:    Reference/glXQueryContextInfoEXT.html
	deleted:    Reference/glXQueryServerString.html
	deleted:    Reference/glXWaitGL.html
	deleted:    Reference/glXWaitX.html
	deleted:    Reference/gluBeginCurve.html
	deleted:    Reference/gluBeginSurface.html
	deleted:    Reference/gluBuild1DMipmaps.html
	deleted:    Reference/gluBuild2DMipmaps.html
	deleted:    Reference/gluCylinder.html
	deleted:    Reference/gluDisk.html
	deleted:    Reference/gluErrorString.html
	deleted:    Reference/gluGetNurbsProperty.html
	deleted:    Reference/gluGetString.html
	deleted:    Reference/gluGetTessProperty.html
	deleted:    Reference/gluLoadSamplingMatrices.html
	deleted:    Reference/gluNextContour.html
	deleted:    Reference/gluNurbsCallback.html
	deleted:    Reference/gluNurbsCurve.html
	deleted:    Reference/gluNurbsProperty.html
	deleted:    Reference/gluNurbsSurface.html
	deleted:    Reference/gluPartialDisk.html
	deleted:    Reference/gluPickMatrix.html
	deleted:    Reference/gluProject.html
	deleted:    Reference/gluPwlCurve.html
	deleted:    Reference/gluQuadricCallback.html
	deleted:    Reference/gluQuadricDrawStyle.html
	deleted:    Reference/gluQuadricNormals.html
	deleted:    Reference/gluQuadricOrientation.html
	deleted:    Reference/gluQuadricTexture.html
	deleted:    Reference/gluScaleImage.html
	deleted:    Reference/gluSphere.html
	deleted:    Reference/gluTessCallback.html
	deleted:    Reference/gluTessProperty.html
	deleted:    Reference/gluTessVertex.html
	deleted:    Reference/gluUnProject.html
	deleted:    Reference/images/OpenGL3.gif
	deleted:    Reference/symbols/Delta.gif
	deleted:    Reference/symbols/Delta.xbm
	deleted:    Reference/symbols/Equiv.gif
	deleted:    Reference/symbols/Equiv.xbm
	deleted:    Reference/symbols/GreatEq.gif
	deleted:    Reference/symbols/GreatEq.xbm
	deleted:    Reference/symbols/Infinity.gif
	deleted:    Reference/symbols/Infinity.xbm
	deleted:    Reference/symbols/LAngle.gif
	deleted:    Reference/symbols/LAngle.xbm
	deleted:    Reference/symbols/LArrow.gif
	deleted:    Reference/symbols/LArrow.xbm
	deleted:    Reference/symbols/LFloor.gif
	deleted:    Reference/symbols/LFloor.xbm
	deleted:    Reference/symbols/LessEq.gif
	deleted:    Reference/symbols/LessEq.xbm
	deleted:    Reference/symbols/Minus.gif
	deleted:    Reference/symbols/Minus.xbm
	deleted:    Reference/symbols/NotEq.gif
	deleted:    Reference/symbols/NotEq.xbm
	deleted:    Reference/symbols/Prime.gif
	deleted:    Reference/symbols/Prime.xbm
	deleted:    Reference/symbols/RAngle.gif
	deleted:    Reference/symbols/RAngle.xbm
	deleted:    Reference/symbols/RFloor.gif
	deleted:    Reference/symbols/RFloor.xbm
	deleted:    Reference/symbols/Times.gif
	deleted:    Reference/symbols/Times.xbm
	deleted:    buttons/AlphaOff.gif
	deleted:    buttons/AlphaOn.gif
	deleted:    buttons/ArrowLeft.gif
	deleted:    buttons/ArrowLeftOff.gif
	deleted:    buttons/ArrowLeftOn.gif
	deleted:    buttons/ArrowRight.gif
	deleted:    buttons/ArrowRightOff.gif
	deleted:    buttons/ArrowRightOn.gif
	deleted:    buttons/ArrowUp.gif
	deleted:    buttons/BlueBtn.gif
	deleted:    buttons/GreenBtn.gif
	deleted:    buttons/ImpGuide.gif
	deleted:    buttons/ImpGuideOff.gif
	deleted:    buttons/ImpGuideOn.gif
	deleted:    buttons/Index.gif
	deleted:    buttons/IndexOff.gif
	deleted:    buttons/IndexOn.gif
	deleted:    buttons/RedBtn.gif
	deleted:    buttons/Reference.gif
	deleted:    buttons/ReferenceOff.gif
	deleted:    buttons/ReferenceOn.gif
	deleted:    buttons/YellowBtn.gif
	deleted:    images/AddisonWesley.gif
	deleted:    images/HPlogo.gif
	deleted:    images/OpenGL.gif
	deleted:    images/OpenGL2.gif
	deleted:    images/OpenGL3.gif
	deleted:    images/OpenGLanim.gif
	deleted:    images/WhiteMarble.jpg
	deleted:    index.html
	deleted:    symbols/C.gif
	deleted:    symbols/C.xbm
	deleted:    symbols/EmSpace.gif
	deleted:    symbols/EmSpace.xbm
	deleted:    symbols/R.gif
	deleted:    symbols/R.xbm
Merge branch 'master' into gh-pages

Conflicts:
	FrontMatter.html
	ImpGuide.html
	ImpGuide/01_Overview.html
	ImpGuide/03_RunProg.html
	ImpGuide/04_CompLink.html
	ImpGuide/05_WriteProg.html
	OpenGL.html
	Reference/glAccum.html
	Reference/glBegin.html
	Reference/glBitmap.html
	Reference/glBlendFunc.html
	Reference/glCallLists.html
	Reference/glClearIndex.html
	Reference/glClearStencil.html
	Reference/glColor.html
	Reference/glCopyPixels.html
	Reference/glCopyTexImage1D.html
	Reference/glCopyTexImage2D.html
	Reference/glCopyTexSubImage1D.html
	Reference/glCopyTexSubImage2D.html
	Reference/glCopyTexSubImage3DEXT.html
	Reference/glDeleteLists.html
	Reference/glDepthRange.html
	Reference/glDrawArraySetHP.html
	Reference/glDrawBuffer.html
	Reference/glDrawPixels.html
	Reference/glEvalMesh.html
	Reference/glEvalPoint.html
	Reference/glFeedbackBuffer.html
	Reference/glFog.html
	Reference/glFrustum.html
	Reference/glGenLists.html
	Reference/glGet.html
	Reference/glGetClipPlane.html
	Reference/glGetLight.html
	Reference/glGetMaterial.html
	Reference/glGetPolygonStipple.html
	Reference/glGetString.html
	Reference/glGetTexEnv.html
	Reference/glGetTexParameter.html
	Reference/glLight.html
	Reference/glLightModel.html
	Reference/glLineStipple.html
	Reference/glLineWidth.html
	Reference/glLoadMatrix.html
	Reference/glMap2.html
	Reference/glMapGrid.html
	Reference/glMaterial.html
	Reference/glMultMatrix.html
	Reference/glNormal.html
	Reference/glOrtho.html
	Reference/glPixelStore.html
	Reference/glPixelTransfer.html
	Reference/glPointSize.html
	Reference/glPolygonOffset.html
	Reference/glPolygonStipple.html
	Reference/glPushAttrib.html
	Reference/glReadBuffer.html
	Reference/glReadPixels.html
	Reference/glRotate.html
	Reference/glSelectBuffer.html
	Reference/glShadeModel.html
	Reference/glStencilFunc.html
	Reference/glStencilOp.html
	Reference/glTexEnv.html
	Reference/glTexGen.html
	Reference/glTexImage1D.html
	Reference/glTexImage2D.html
	Reference/glTexImage3DEXT.html
	Reference/glTexParameter.html
	Reference/glTexSubImage1D.html
	Reference/glTexSubImage2D.html
	Reference/glTexSubImage3DEXT.html
	Reference/glXGetClientString.html
	Reference/gluBuild1DMipmaps.html
	Reference/gluBuild2DMipmaps.html
	Reference/gluCylinder.html
	Reference/gluDisk.html
	Reference/gluGetString.html
	Reference/gluNurbsSurface.html
	Reference/gluPartialDisk.html
	Reference/gluProject.html
	Reference/gluSphere.html
	Reference/gluUnProject.html
	index.html