diff options
| author | Melanie | 2014-01-05 20:12:32 +0000 |
|---|---|---|
| committer | Melanie | 2014-01-05 20:12:32 +0000 |
| commit | e79fab91dbe731e9d177de61993d963bcc067299 (patch) | |
| tree | 4358fd508e55dd91774ba83b8e4c30fc24f452c7 /OpenSim/Framework/UpdateShapeArgs.cs | |
| parent | Merge commit '92aad6f1bb45974927fa43d6fd30f98337dee3f0' into careminster (diff) | |
| parent | Some missing definitions needed for successful compilation. (diff) | |
| download | opensim-SC-e79fab91dbe731e9d177de61993d963bcc067299.zip opensim-SC-e79fab91dbe731e9d177de61993d963bcc067299.tar.gz opensim-SC-e79fab91dbe731e9d177de61993d963bcc067299.tar.bz2 opensim-SC-e79fab91dbe731e9d177de61993d963bcc067299.tar.xz | |
Intermediate commit. Sill errors.
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
OpenSim/Framework/RegionInfo.cs
OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Services/UserProfilesService/UserProfilesService.cs
Diffstat (limited to 'OpenSim/Framework/UpdateShapeArgs.cs')
0 files changed, 0 insertions, 0 deletions