Commit Graph

12 Commits (bdc72a00a2d92e5130b0dc5cc4bd412f269a57a7)

Author SHA1 Message Date
Tank_Master dc58f56a88 LLProxy bugfixes and cleanup. Work done by Log Linden 2011-09-12 21:39:18 -07:00
Tank_Master 205747903f Reintroduce Socks5 support with latest LL code from v-dev (Work done by Log Linden) 2011-09-03 00:49:31 -07:00
Tank_Master 537cf438c4 Backed out changeset: e232799510ef (Old socks5 proxy code)
Prepairing for merging in LL's new version.
2011-09-01 09:23:57 -07:00
Tank_Master 5771402086 HTTP and socks 5 proxy support (Not tested). Work done by Log Linden 2011-07-10 01:47:26 -07:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Robert Knop ce888706c5 svn merge -r108236:108243 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25
Still merging from server-1.25... one day I will catch up!

No conflicts
2009-01-19 22:05:19 +00:00
Aaron Brashears e3cf284388 Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
Steven Bennetts da94c0eaa2 QAR-855 Viewer 1.21 RC 2
merge viewer_1-21 94770-96059 -> release
2008-09-12 06:27:13 +00:00
Aaron Brashears 5595a99623 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. 2007-10-04 23:19:43 +00:00
Aaron Brashears 305c74d516 Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release. 2007-02-02 17:28:58 +00:00
Aaron Brashears c189fc0b57 Result of svn merge -r56700:56797 svn+ssh://svn/svn/linden/branches/more-random into release. 2007-01-18 00:44:48 +00:00
James Cook 420b91db29 Print done when done. 2007-01-02 08:33:20 +00:00