livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
933 Commits
2 Branches
0 Tags
301 MiB
C++ 86.3%
R 8.1%
GLSL 1.7%
HTML 1.1%
Python 0.8%
Other 1.9%
 
 
 
 
 
 
Go to file
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
doc DEV-34299 - VWR-13996: Avatars are invisible, except for attachments 2009-07-14 15:24:37 +00:00
etc 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
indra 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
scripts merge -r125267:125272 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/inventory-links__merge__viewer2.0.0-3-r125202 to svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 2009-06-24 21:36:42 +00:00
install.xml Reenable freetype-2.3.9 for win32 (DEV-32831) 2009-09-09 18:09:03 +00:00