- Apr 25, 2010
-
-
Aimee Linden authored
-
- Nov 05, 2009
-
-
palange authored
Fixed mac breakage.
-
- Nov 02, 2009
-
-
palange authored
-
- Apr 16, 2009
-
-
Adam Moss authored
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1 QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
-
- Jan 07, 2009
-
-
Aaron Brashears authored
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
-
- Nov 06, 2008
-
-
Kartic Krishnamurthy authored
================================= svn merge -r100865:101402 svn+ssh://svn/svn/linden/branches/purge-dpo-code-for-merge . QAR-951 : Sandbox QA for DEV 20842 - Ensure DPO is not enabled accidentally QAR-967 : Merge Build for DEV 20842 - Ensure DPOis not enabled accidentally QA tested: Beast, Oskar DEV's fulfilled as part of this branch: ====================================== DEV-20842 Prevent accidental activation of DPO procs DEV-23028 Mac build fails - link error dual inclusion DEV-20824 VWR-9255: Build fails on mac_updater and mac_crash_logger targets due to info.plist problems DEV-22997 Xcode project: 'server' target has no dependencies DEV-23353 Friend request custom messages come through as an asset tag. DEV-23309 Voice Chat Indicator does not show active voice status DEV-23187 Can't teleport to home location
-
- Aug 12, 2008
-
-
Steven Bennetts authored
merge release@93398 viewer-merge-1@94007 -> release dataserver-is-deprecated
-
- Jun 25, 2008
-
-
Steven Bennetts authored
dataserver-is-deprecated
-
- Jun 02, 2008
-
-
svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-mergeBryan O'Sullivan authored
dataserver-is-deprecated for-fucks-sake-whats-with-these-commit-markers
-
- May 08, 2008
-
-
Steven Bennetts authored
merge -r 87067:87077 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-4-merge -> release. dataserver-is-deprecated.
-
- Apr 03, 2008
-
-
Steven Bennetts authored
QAR_367 (RC1) - merge Branch_1-19-1-Viewer -r 81609 : 81993 -> release QAR-374 (RC2) - merge Branch_1-19-1-Viewer -r 81993 : 82589 -> release QAR-408 (RC3) - merge Branch_1-19-1-Viewer -r 82589 : 83128 -> release QAR-426 (rc4) - merge Branch_1-19-1-Viewer -r 83125 : 83719 -> release (Actual merge: release@83793 Branch_1-19-1-Viewer-merge@83953 -> release)
-
- Mar 18, 2008
-
-
Brian McGroarty authored
svn merge -r 82602:82644 svn+ssh://svn/svn/linden/qa/maintenance-6-merge-82557 release/
-
- Dec 05, 2007
-
-
Don Kjer authored
EFFECTIVE MERGE: svn merge -r 71520:73420 svn+ssh://svn/svn/linden/branches/maintenance-3 into release ACTUAL MERGE: svn merge -r 75074:75114 svn+ssh://svn/svn/linden/qa/maintenance-3-merge-75067 into release
-
- Oct 04, 2007
-
-
Aaron Brashears authored
Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
-
- Aug 01, 2007
-
-
Monroe Williams authored
svn merge --ignore-ancestry svn+ssh://svn.lindenlab.com/svn/linden/release@66449 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-1@67131
-
- May 30, 2007
-
-
Kelly Washington authored
-
- May 01, 2007
-
- Mar 20, 2007
-
-
Karen Clark authored
svn merge -r59459:59476 svn+ssh://svn.lindenlab.com/svn/linden/branches/adroit.r69-75_2 into svn+ssh://svn.lindenlab.com/svn/linden/release.
-
- Feb 02, 2007
-
- Jan 24, 2007
-
-
Steven Bennetts authored
-
- Jan 02, 2007
-
-
James Cook authored
-