<feed xmlns='http://www.w3.org/2005/Atom'>
<title>viewer.git/doc/contributions.txt, branch cef_147</title>
<subtitle>Megapahit's fork of the Second Life viewer.
</subtitle>
<id>https://megapahit.org/viewer.git/atom?h=cef_147</id>
<link rel='self' href='https://megapahit.org/viewer.git/atom?h=cef_147'/>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/'/>
<updated>2024-09-03T17:10:32Z</updated>
<entry>
<title>secondlife/viewer#2483: Fix label typo in PBR terrain texture transforms tab</title>
<updated>2024-09-03T17:10:32Z</updated>
<author>
<name>Cosmic Linden</name>
<email>cosmic@lindenlab.com</email>
</author>
<published>2024-09-03T17:05:44Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=e42e95d87896fa3be0b48108dc3b79af2e1caf66'/>
<id>urn:sha1:e42e95d87896fa3be0b48108dc3b79af2e1caf66</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Post pull request contribution doc update (#2077)</title>
<updated>2024-08-02T10:02:36Z</updated>
<author>
<name>Andrey Kleshchev</name>
<email>andreykproductengine@lindenlab.com</email>
</author>
<published>2024-08-01T15:16:50Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=daa240164d8a639abf5a2a227b5e3a7723bacb5b'/>
<id>urn:sha1:daa240164d8a639abf5a2a227b5e3a7723bacb5b</id>
<content type='text'>
</content>
</entry>
<entry>
<title>secondlife/viewer#1744: Fix missing LSL constant INVENTORY_SETTING in keywords_lsl_default.xml</title>
<updated>2024-06-13T16:11:40Z</updated>
<author>
<name>Cosmic Linden</name>
<email>cosmic@lindenlab.com</email>
</author>
<published>2024-06-12T22:57:20Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=fa4e463ba87a483a62528cf67bcb93b14add4911'/>
<id>urn:sha1:fa4e463ba87a483a62528cf67bcb93b14add4911</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge branch 'main' into marchcat/x-mf-merge</title>
<updated>2024-05-15T09:51:21Z</updated>
<author>
<name>Andrey Lihatskiy</name>
<email>alihatskiy@productengine.com</email>
</author>
<published>2024-05-15T09:51:21Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=d9153532b8637cbfe992200effb1d24c597a732f'/>
<id>urn:sha1:d9153532b8637cbfe992200effb1d24c597a732f</id>
<content type='text'>
# Conflicts:
#	doc/contributions.txt
#	indra/newview/llfloaterimagepreview.cpp
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/main' into release/materials_featurette</title>
<updated>2024-04-24T16:55:34Z</updated>
<author>
<name>Brad Linden</name>
<email>brad@lindenlab.com</email>
</author>
<published>2024-04-24T16:55:34Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=86c0c1d5536897c925f4e8aa2859a160313d964c'/>
<id>urn:sha1:86c0c1d5536897c925f4e8aa2859a160313d964c</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge branch 'main' into marchcat/x-merge</title>
<updated>2024-04-24T15:45:54Z</updated>
<author>
<name>Andrey Lihatskiy</name>
<email>alihatskiy@productengine.com</email>
</author>
<published>2024-04-24T15:45:54Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=428f21cf795f440f69a772b314f877ea0c6d4741'/>
<id>urn:sha1:428f21cf795f440f69a772b314f877ea0c6d4741</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge branch 'main' into marchcat/x-merge</title>
<updated>2024-04-12T12:43:34Z</updated>
<author>
<name>Andrey Lihatskiy</name>
<email>alihatskiy@productengine.com</email>
</author>
<published>2024-04-12T12:43:34Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=eab5beb54cacc2b0dc2cddad4a78634e7468a298'/>
<id>urn:sha1:eab5beb54cacc2b0dc2cddad4a78634e7468a298</id>
<content type='text'>
# Conflicts:
#	indra/llimage/llimageworker.cpp
#	indra/llimage/llimageworker.h
#	indra/newview/llcontrolavatar.cpp
#	indra/newview/llfloaterprofiletexture.cpp
#	indra/newview/lloutfitslist.cpp
#	indra/newview/lloutfitslist.h
#	indra/newview/lltexturefetch.cpp
</content>
</entry>
<entry>
<title>Merge branch 'main' into marchcat/y-merge</title>
<updated>2024-04-10T04:08:25Z</updated>
<author>
<name>Andrey Lihatskiy</name>
<email>alihatskiy@productengine.com</email>
</author>
<published>2024-04-10T03:57:52Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=84dfe55810815e8c274044cea5c81aaed89a787f'/>
<id>urn:sha1:84dfe55810815e8c274044cea5c81aaed89a787f</id>
<content type='text'>
# Conflicts:
#	autobuild.xml
#	indra/llcommon/llsys.cpp
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/main' into release/materials_featurette</title>
<updated>2024-04-09T21:17:34Z</updated>
<author>
<name>Brad Linden</name>
<email>brad@lindenlab.com</email>
</author>
<published>2024-04-09T21:17:34Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=5a47a3cb2366b9da9a595d37c88703497e111005'/>
<id>urn:sha1:5a47a3cb2366b9da9a595d37c88703497e111005</id>
<content type='text'>
</content>
</entry>
<entry>
<title>viewer#1051: Credit Ansariel for this fix</title>
<updated>2024-03-25T22:52:30Z</updated>
<author>
<name>Cosmic Linden</name>
<email>cosmic@lindenlab.com</email>
</author>
<published>2024-03-25T22:50:45Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=2ef42c8c3649898bdc9a2e5a95a5fa34a700daf9'/>
<id>urn:sha1:2ef42c8c3649898bdc9a2e5a95a5fa34a700daf9</id>
<content type='text'>
</content>
</entry>
</feed>
