Age | Commit message (Collapse) | Author | |
---|---|---|---|
2009-07-06 | Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also ↵ | James Cook | |
UI color refactoring and new FreeType font library on Linux. svn merge -r126038:126164 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-5 | |||
2009-06-21 | merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 | Steven Bennetts | |
ignore-dead-branch | |||
2009-01-08 | Result of svn merge -r107256:107258 ↵ | Aaron Brashears | |
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 | |||
2008-11-07 | QAR-992 Merging revisions 101012-101170,101686-101687 of ↵ | Mark Palange | |
svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release | |||
2008-08-12 | QAR-767 Combined maint-render-7 and maint-viewer-9 merge | Steven Bennetts | |
merge release@93398 viewer-merge-1@94007 -> release dataserver-is-deprecated | |||
2008-07-23 | svn merge -r92720:92721 ↵ | Karl Steifvater | |
svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge QAR-698 / DEV-9985 add touch "position" information to touch-events in LSL | |||
2008-07-22 | svn merge -r92710:92709 svn+ssh://svn.lindenlab.com/svn/linden/release --> ↵ | Josh Bell | |
release Undo r92710 (for QAR-698) - went straight into release instead of a side branch for validation. | |||
2008-07-22 | merge uv-picking branch. | Karl Steifvater | |
svn merge -r92602:92632 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-4 | |||
2008-06-26 | QAR-628 merge string-cleanup-5 -r 90476:90508 -> release | Steven Bennetts | |
dataserver-is-deprecated | |||
2008-06-06 | QAR-650 - Viewer RC 9 merge -> release (post cmake) | Steven Bennetts | |
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release | |||
2008-05-08 | QAR-570 maint-render-4 merge | Steven Bennetts | |
merge -r 87067:87077 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-4-merge -> release. dataserver-is-deprecated. | |||
2008-04-01 | merge release@83343 skinning-1-merge@83714 -> release | Steven Bennetts | |
QAR-424 | |||
2008-02-27 | Merge of windlight into release (QAR-286). This includes all changes in | Brad Kittenbrink | |
windlight14 which have passed QA (up through r79932). svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620 | |||
2007-11-07 | merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079 | Steven Bennetts | |
2007-11-01 | svn merge -r 71509:72877 ↵ | Josh Bell | |
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-4-Viewer --> release Backport patches and translations from RC branch | |||
2007-10-10 | svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3 | Christian Goetze | |
2007-10-04 | Result of svn merge -r71162:71205 ↵ | Aaron Brashears | |
svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. | |||
2007-06-21 | merge -r62831:64079 branches/maintenance to release | Kelly Washington | |
2007-03-02 | merge release@58699 beta-1-14-0@58707 -> release | Steven Bennetts | |
2007-02-17 | merge -r 56779:58057 /branches/selection_management | Richard Nelson | |
2007-01-03 | corrected, removed, and updated comments throughout the code to be more ↵ | Aaron Brashears | |
useful. no code changes. SL-13762 | |||
2007-01-02 | Print done when done. | James Cook | |