summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/it/floater_preferences.xml
AgeCommit message (Collapse)Author
2010-02-18move base back to default because doing it as a backout was causing merge errorsKent Quirk
2010-02-17EXT-5461 - Installing 1.23.5 release version over recent 2.0 builds corrupts ↵Richard Linden
1.23s UI reviewed by Leyla
2010-01-30DEV-43688 resident translations for DA (set4-set5),Ramzi Linden
resident translations for PL (set1 thru set4), resident translations for IT (set1 thru set6) (I can promise this is the last weekend I work for LL. Peace Love & Hope 2010.)
2009-11-04converted all floater titles to uppercaserichard
2009-09-01Sync up with a number of SVN changes that snuck in via weird mergesBryan O'Sullivan
2009-05-11Switch the XML file line endings to native.Bryan O'Sullivan
2009-05-04QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3Adam Moss
svn merge -r118927:118939 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476 this is a composite of... svn merge -r115088:118182 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23 conflicts resolved: C doc/contributions.txt C indra/llaudio/audioengine.cpp C indra/newview/CMakeLists.txt C indra/newview/llfloaterlandholdings.cpp C indra/newview/llpaneldirbrowser.cpp C indra/newview/llpanelgrouplandmoney.cpp C indra/newview/llpreviewscript.cpp C indra/newview/llviewermenu.cpp C indra/newview/skins/default/xui/en-us/notifications.xml and... svn merge -r116937:118673 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 minor-to-trivial conflicts resolved: C indra/llcommon/llversionserver.h C indra/newsim/llrezdata.cpp C indra/newsim/llstate.cpp C indra/upgrade/schema_version/sequence/3/index_log_paypal.sql
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 09:04:08 +0000