<feed xmlns='http://www.w3.org/2005/Atom'>
<title>viewer.git/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml, branch main</title>
<subtitle>Megapahit's fork of the Second Life viewer.
</subtitle>
<id>https://www.megapahit.org/viewer.git/atom?h=main</id>
<link rel='self' href='https://www.megapahit.org/viewer.git/atom?h=main'/>
<link rel='alternate' type='text/html' href='https://www.megapahit.org/viewer.git/'/>
<updated>2020-05-04T21:37:16Z</updated>
<entry>
<title>Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint</title>
<updated>2020-05-04T21:37:16Z</updated>
<author>
<name>Andrey Lihatskiy</name>
<email>alihatskiy@productengine.com</email>
</author>
<published>2020-05-04T21:37:16Z</published>
<link rel='alternate' type='text/html' href='https://www.megapahit.org/viewer.git/commit/?id=ec9b9898635e90dcdc3579e2121ef11f8ca2a0a8'/>
<id>urn:sha1:ec9b9898635e90dcdc3579e2121ef11f8ca2a0a8</id>
<content type='text'>
# Conflicts:
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorypanel.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
</content>
</entry>
<entry>
<title>SL-12641 Remade 'Pick: Texture' floater to eliminate translation overlaps</title>
<updated>2020-02-18T16:33:28Z</updated>
<author>
<name>Andrey Kleshchev</name>
<email>andreykproductengine@lindenlab.com</email>
</author>
<published>2020-02-18T16:33:28Z</published>
<link rel='alternate' type='text/html' href='https://www.megapahit.org/viewer.git/commit/?id=cfb2b95c8ca3dbd9761bbd2124cf0361a4832bce'/>
<id>urn:sha1:cfb2b95c8ca3dbd9761bbd2124cf0361a4832bce</id>
<content type='text'>
</content>
</entry>
<entry>
<title>FIX INTL-367 Translation update for Set59 (EEP Viewer, DRTVWR-440)</title>
<updated>2019-09-09T20:21:01Z</updated>
<author>
<name>eli</name>
<email>eli@lindenlab.com</email>
</author>
<published>2019-09-09T20:21:01Z</published>
<link rel='alternate' type='text/html' href='https://www.megapahit.org/viewer.git/commit/?id=d2a7f239cd5c545ebed6cc3802e6114002d00946'/>
<id>urn:sha1:d2a7f239cd5c545ebed6cc3802e6114002d00946</id>
<content type='text'>
</content>
</entry>
<entry>
<title>remove execute permission from many files that should not have it</title>
<updated>2015-11-10T14:48:56Z</updated>
<author>
<name>Oz Linden</name>
<email>oz@lindenlab.com</email>
</author>
<published>2015-11-10T14:48:56Z</published>
<link rel='alternate' type='text/html' href='https://www.megapahit.org/viewer.git/commit/?id=c8726aba303bcf1207b730a344536e25491420bc'/>
<id>urn:sha1:c8726aba303bcf1207b730a344536e25491420bc</id>
<content type='text'>
</content>
</entry>
<entry>
<title>merge changes for DRTVWR-309</title>
<updated>2013-04-24T22:52:59Z</updated>
<author>
<name>Oz Linden</name>
<email>oz@lindenlab.com</email>
</author>
<published>2013-04-24T22:52:59Z</published>
<link rel='alternate' type='text/html' href='https://www.megapahit.org/viewer.git/commit/?id=2dc4f8f8e98da565c158ec9947fe96eccd4920e9'/>
<id>urn:sha1:2dc4f8f8e98da565c158ec9947fe96eccd4920e9</id>
<content type='text'>
</content>
</entry>
<entry>
<title>FIX INTL-114 translation for 9 languages of major update from CHUI (based on latest merge with viewer-development)</title>
<updated>2013-04-24T20:56:53Z</updated>
<author>
<name>eli</name>
<email>none@none</email>
</author>
<published>2013-04-24T20:56:53Z</published>
<link rel='alternate' type='text/html' href='https://www.megapahit.org/viewer.git/commit/?id=774277e9cf3b6b55c7aaaa9dadfe2ef2ddb0b0c2'/>
<id>urn:sha1:774277e9cf3b6b55c7aaaa9dadfe2ef2ddb0b0c2</id>
<content type='text'>
</content>
</entry>
<entry>
<title>sync with viewer-development (per DRTVWR-309)</title>
<updated>2013-04-24T20:49:11Z</updated>
<author>
<name>eli</name>
<email>none@none</email>
</author>
<published>2013-04-24T20:49:11Z</published>
<link rel='alternate' type='text/html' href='https://www.megapahit.org/viewer.git/commit/?id=80772aa1ad62a89129f24508e2005b20fec88854'/>
<id>urn:sha1:80772aa1ad62a89129f24508e2005b20fec88854</id>
<content type='text'>
</content>
</entry>
<entry>
<title>FIX INTL-114 translation for 9 languages of major update from CHUI and other projects</title>
<updated>2013-04-03T22:35:45Z</updated>
<author>
<name>eli</name>
<email>none@none</email>
</author>
<published>2013-04-03T22:35:45Z</published>
<link rel='alternate' type='text/html' href='https://www.megapahit.org/viewer.git/commit/?id=9f56dad9582c8585a92c54baf28c928b2d3bb7d2'/>
<id>urn:sha1:9f56dad9582c8585a92c54baf28c928b2d3bb7d2</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Update Mac and Windows breakpad builds to latest</title>
<updated>2013-03-29T14:50:08Z</updated>
<author>
<name>Graham Madarasz</name>
<email>graham@lindenlab.com</email>
</author>
<published>2013-03-29T14:50:08Z</published>
<link rel='alternate' type='text/html' href='https://www.megapahit.org/viewer.git/commit/?id=bf6182daa8b4d7cea79310547f71d7a3155e17b0'/>
<id>urn:sha1:bf6182daa8b4d7cea79310547f71d7a3155e17b0</id>
<content type='text'>
</content>
</entry>
<entry>
<title>FIX INTL-101 translation of set33 for 8 languages; add new files; remove obsolete files</title>
<updated>2012-08-30T20:40:14Z</updated>
<author>
<name>eli</name>
<email>none@none</email>
</author>
<published>2012-08-30T20:40:14Z</published>
<link rel='alternate' type='text/html' href='https://www.megapahit.org/viewer.git/commit/?id=92a69950ab4e160c67158b9b1669ad2610821cc7'/>
<id>urn:sha1:92a69950ab4e160c67158b9b1669ad2610821cc7</id>
<content type='text'>
</content>
</entry>
</feed>
