2 Commits (91eb7f2e048369ddfc76eb2fbae83fa50ad8322a)

Author	SHA1	Message	Date
Kelly Washington	aa2b978bf5	merge -r 112783:112799 linden/branches/kelly/lsl-http-in-merge to linden/trunk	2009-02-24 19:29:36 +00:00
Bryan O'Sullivan	9db949eec3	svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge ... dataserver-is-deprecated for-fucks-sake-whats-with-these-commit-markers	2008-06-02 21:14:31 +00:00