2 Commits (1d4d4fec00aacb1e1e00a4f60a6af4d8ed3b8bde)

Author	SHA1	Message	Date
Brian McGroarty	7e43203558	Xcode 3.2 line-ending warning	2009-09-09 22:21:01 +00:00
Monroe Williams	745845f799	svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910 ... svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05 Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.	2009-08-27 19:00:18 +00:00