diff options
| author | Diva Canto | 2013-07-18 12:23:27 -0700 |
|---|---|---|
| committer | Diva Canto | 2013-07-18 12:23:27 -0700 |
| commit | 9e35b069a43942285214ff485c8f5ffb53e7c5ec (patch) | |
| tree | 7f58d5277f530be8e1286c856d5aecef80126f9e /OpenSim/Framework/ConfigurationMember.cs | |
| parent | Merge branch 'master' of git://opensimulator.org/git/opensim (diff) | |
| download | opensim-SC_OLD-9e35b069a43942285214ff485c8f5ffb53e7c5ec.zip opensim-SC_OLD-9e35b069a43942285214ff485c8f5ffb53e7c5ec.tar.gz opensim-SC_OLD-9e35b069a43942285214ff485c8f5ffb53e7c5ec.tar.bz2 opensim-SC_OLD-9e35b069a43942285214ff485c8f5ffb53e7c5ec.tar.xz | |
Reverting the reverts I did yesterday. cpu-branch has now been
successfully tested, and I'm merging back those changes, which proved to
be good.
Revert "Revert "Cleared up much confusion in PollServiceRequestManager. Here's the history:""
This reverts commit fa2370b32ee57a07f27501152c3c705a883b13d8.
Diffstat (limited to 'OpenSim/Framework/ConfigurationMember.cs')
0 files changed, 0 insertions, 0 deletions