Commit Graph

2 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Tofu Linden 221885fc73 Hack librt inclusion into llcommon for all Linux builds. The dep is needed for llcommon, but it was being satisfied elsewhere for viewer builds and got to dodge the problem. This should quieten the server builds somewhat. 2010-02-17 14:29:56 +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