Adam Moss 03e4be4305 r128438 introduced a hilarious piece of mergefuckery about five weeks ago. eyeball this diff for a good laugh. I've verified that the evil twin is *identical*. ... reviewed by palmer.		2009-09-10 20:04:37 +00:00
..
CMakeLists.txt	…
llcubemap.cpp	…
llcubemap.h	…
llfontbitmapcache.cpp	revisit the fix for these:	2009-09-10 19:08:11 +00:00
llfontbitmapcache.h	revisit the fix for these:	2009-09-10 19:08:11 +00:00
llfontfreetype.cpp	revisit the fix for these:	2009-09-10 19:08:11 +00:00
llfontfreetype.h	r128438 introduced a hilarious piece of mergefuckery about five weeks ago. eyeball this diff for a good laugh. I've verified that the evil twin is *identical*.	2009-09-10 20:04:37 +00:00
llfontgl.cpp	merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3	2009-08-24 20:04:52 +00:00
llfontgl.h	merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3	2009-08-24 20:04:52 +00:00
llfontregistry.cpp	merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3	2009-09-07 22:55:07 +00:00
llfontregistry.h	…
llgl.cpp	…
llgl.h	…
llgldbg.cpp	…
llgldbg.h	…
llglheaders.h	…
llglslshader.cpp	…
llglslshader.h	…
llglstates.h	…
llgltypes.h	…
llimagegl.cpp	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llimagegl.h	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910	2009-08-27 19:00:18 +00:00
llpostprocess.cpp	…
llpostprocess.h	…
llrender.cpp	…
llrender.h	…
llrendersphere.cpp	…
llrendersphere.h	…
llrendertarget.cpp	…
llrendertarget.h	…
llshadermgr.cpp	…
llshadermgr.h	…
lltexture.cpp	…
lltexture.h	…
llvertexbuffer.cpp	…
llvertexbuffer.h	…