Commit Graph

2 Commits (1d4d4fec00aacb1e1e00a4f60a6af4d8ed3b8bde)

Author SHA1 Message Date
brad kittenbrink 3df557435f Post-merge cleanups (adding LL_COMMON_API declarations) 2009-08-31 18:43:12 -04: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