6 Commits (1d4d4fec00aacb1e1e00a4f60a6af4d8ed3b8bde)

Author	SHA1	Message	Date
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
Christian Goetze	b069bb9e71	svn merge -r96886:98039 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release	2008-10-01 00:42:47 +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
James Cook	12ac04231b	merge -r 57761:57967 im-email-session-3, removes database load from IM to email session tracking, introduces new format for email return addresses	2007-02-15 20:24:08 +00:00
Josh Bell	d60f16540d	svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@56429 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance@56431 ... This turned up the following "lost" changes: llapp.cpp (from maintenance r55371) - SIGPIPE fix, possibly llfontgl.cpp (from maintenance r50207) - whitespace only inventorybridge.cpp (property - non-executable) skins/xui/*/* (from maintenance r55380) - XML processing instruction went AWOL	2007-01-04 02:04:29 +00:00
James Cook	420b91db29	Print done when done.	2007-01-02 08:33:20 +00:00