| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2009-07-10 | merge QAR-1579: texture-cleanup-1. | Xiaohong Bao | |
| 2009-06-21 | merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 | Steven Bennetts | |
| ignore-dead-branch | |||
| 2009-02-18 | Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 ↵ | Brad Kittenbrink | |
| (maint-render-9) and QAR-1236 (dll-msvcrt-2) svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833 | |||
| 2009-02-03 | svn merge -r107016:108767 ↵ | Mark Palange | |
| svn+ssh://svn.lindenlab.com/svn/linden/viewer/viewer_1-22 Merge back of viewer 1.22 RC6 and RC7 change to trunk. QAR-1214 and QAR-1227 | |||
| 2009-02-03 | QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergeme | Adam Moss | |
| svn merge -r108355:109316 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314 Whew. | |||
| 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-12-23 | QAR-1142 merging 1.22 RC0-RC4 changes. | Mark Palange | |
| svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge | |||
| 2008-11-19 | QAR-1018 Lightweight Windows Setup App (windows-setup-3). svn merge ↵ | James Cook | |
| -r102882:102883 svn+ssh://svn.lindenlab.com/svn/linden/branches/windows-setup/windows-setup-3-merge | |||
| 2008-09-12 | QAR-855 Viewer 1.21 RC 2 | Steven Bennetts | |
| merge viewer_1-21 94770-96059 -> release | |||
| 2008-08-28 | merge viewer/viewer_1-21 94170-94770 -> release | Steven Bennetts | |
| merge viewer/viewer_1-21-0 94830-95157 -> release Includes: QAR-786 Sandbox buildme for viewer + server Release Notes on the wiki! QAR-797 teleport failures (DEV-6198 / SVC-972) mergeme | |||
| 2008-06-27 | QAR-669 1.20 Viewer RC11 | Steven Bennetts | |
| QAR-648 1.20 Viewer RC10 merge Branch_1-20-Viewer-2 -r 88724:90511 -> release | |||
| 2008-06-26 | QAR-628 merge string-cleanup-5 -r 90476:90508 -> release | Steven Bennetts | |
| dataserver-is-deprecated | |||
| 2008-06-02 | svn merge -r88066:88786 ↵ | Bryan O'Sullivan | |
| svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge dataserver-is-deprecated for-fucks-sake-whats-with-these-commit-markers | |||
| 2008-05-09 | QAR-565 search-milestone2-merge (more web tabs in search) | Steven Bennetts | |
| 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-12-21 | svn merge -r74200:76302 ↵ | Josh Bell | |
| svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer --> release Wheee, this was fun. Um, let's back-port fixes a little more rapidly next time. Reviewed by CG until alexandria died, did the rest by my lonesome. | |||
| 2007-12-04 | EFFECTIVE MERGE: maint-ui-qa3 -r 73391:74133 -> release | Steven Bennetts | |
| ACTUAL MERGE: merge release@74893 maint-ui-3-merge@74902 -> release | |||
| 2007-12-03 | -74901 (back out premature commit to release) | Steven Bennetts | |
| 2007-12-03 | merge -r 73391:74133 maint-ui-3 -> release | Steven Bennetts | |
| 2007-11-07 | merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079 | Steven Bennetts | |
| 2007-10-17 | QAR-25 svn merge -r71797:71803 svn+ssh://svn/svn/linden/branches/logitech_lcd_4 | 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-08-29 | svn merge -r67650:68653 branches/release-viewer-stats | Bryan O'Sullivan | |
| Branch reviewed by Don. Passed QA buildme this morning. NOTE: This change requires a DB schema upgrade. Upgrade script: indra/upgrade/viewer-stats/redo_viewer_stats | |||
| 2007-06-29 | revert: svn merge -r 64506:64505 svn+ssh://svn/svn/linden/release back into ↵ | Don Kjer | |
| release reverting jakes accidental check in | |||
| 2007-06-29 | Changes to make Logitech code more LL Code Standards compliant, plus remove ↵ | Jake Simpson | |
| all the SDK code and instead just used headers and an included lib that we build ourselves from the Trunk directory. | |||
| 2007-05-08 | Removing Logitech LCD code: svn merge -r 60616:60615 ↵ | Don Kjer | |
| svn+ssh://svn/svn/linden/release into release | |||
| 2007-04-18 | svn merge -r 59608:60615 ↵ | Jake Simpson | |
| svn+ssh://svn.lindenlab.com/svn/linden/branches/jakesbranch --> release Adding Logitech G15 keyboard and Z10 speaker support for those LCD windows. | |||
| 2007-04-03 | merge -r 59337:59951 Branch_1-14-0 -> release. | Steven Bennetts | |
| 2007-03-02 | merge release@58699 beta-1-14-0@58707 -> release | Steven Bennetts | |
| 2007-01-23 | merge -r 56842:57026 maintenance. | Steven Bennetts | |
| 2007-01-02 | Print done when done. | James Cook | |
 |
index : viewer.git | |
| Megapahit's fork of the Second Life viewer. | Erik Kundiman |
| summaryrefslogtreecommitdiff |