summaryrefslogtreecommitdiff
path: root/indra/llmessage/llblowfishcipher.cpp
AgeCommit message (Collapse)Author
2010-10-13correct licenses (fix problem with license change merge)Oz Linden
2009-01-08Result of svn merge -r107256:107258 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2008-04-29Result of svn merge -r85981:85991 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/ssl-sanity-merge into release. QAR-487
2008-04-031.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426Steven Bennetts
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)
2007-10-04Result 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-21merge -r62831:64079 branches/maintenance to releaseKelly Washington
2007-05-01svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate ↵Don Kjer
into release
2007-02-15merge -r 57761:57967 im-email-session-3, removes database load from IM to ↵James Cook
email session tracking, introduces new format for email return addresses
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-16 11:16:46 +0000