3 Commits (98d776ba767aa9d02f5059fd8436206135b49f9f)

Author	SHA1	Message	Date
Arrehn	e277b8a4ac	Merge with LL 2.6.9, initial work. Needs tests, extra XUI merging with particular skins.	2011-08-04 11:53:40 -04:00
Liny	a28934d023	Fixing build with versioning	2011-01-25 22:40:44 -08: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