4 Commits (474b2e55be8679c2cef2d4e4db0a175f21e4a913)

Author	SHA1	Message	Date
Tank_Master	ea86bb88c3	first pass merge	2013-02-04 10:52:32 -08:00
Don Kjer	95f3fb45ae	Cherry-picked windows build fixes from sunshine-experimental	2012-09-24 19:42:58 +00:00
Oz Linden	f368c858cd	correct line endings	2011-08-17 12:09:59 -04: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