| Age | Commit message (Collapse) | Author | 
|---|
|  | release
* WARNING *:  maintenance r64837 is not the last rev to use in the next merge. use r65269 | 
|  | svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
(only inside indra)
(josh) Original log message was:
   svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
bos updated it to be:
   svn merge -r64837:65269 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
However, it appears it actually was:
   svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
... missing some file additions. | 
|  | avatar rendering.  Visual Studio 2005 project file fixed pending. | 
|  | svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release | 
|  | svn+ssh://svn.lindenlab.com/svn/linden/branches/adroit.r69-75_2 into svn+ssh://svn.lindenlab.com/svn/linden/release. | 
|  | svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release. | 
|  | 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 | 
|  | useful. no code changes. SL-13762 | 
|  |  |