{"shas":[["c0d059c7eb8ae0288c9d8ed2ae30e76054faff2d","f3e731dfa293c7a83119d8aacfa41b5d2d780be9@mini3d.org","Merge branch 'master' of git://github.com/Hurricane86/mini3D\n\nConflicts:\n\tsamples/tutorial1/tutorial1.cpp\n\tsource/d3d9/cpp/D3D9PixelShader.cpp\n\tsource/d3d9/cpp/D3D9VertexShader.cpp\n\tsource/d3d9/cpp/D3D9WindowRenderTarget.cpp\n\tsource/ogl20/OGL20GraphicsService.h\n\tsource/ogl20/cpp/OGL20GraphicsService.cpp\n\tsource/ogl20/cpp/OGL20ShaderProgram.cpp\n\tsource/ogl20/oglwrapper/IOGLWrapper.h\n\tsource/ogl20/oglwrapper/linux/OGLWrapperLinux.cpp\n\tsource/ogl20/oglwrapper/linux/OGLWrapperLinux.h\n\tsource/ogl20/oglwrapper/windows/OGLWrapperWindows.h","Jeff"]],"ref":"refs/heads/master","push_id":21339866,"head":"c0d059c7eb8ae0288c9d8ed2ae30e76054faff2d","size":1}