diff options
| author | Melanie | 2009-12-30 20:25:57 +0000 |
|---|---|---|
| committer | Melanie | 2009-12-30 20:25:57 +0000 |
| commit | d49d44923d1be38f6fff12706b156562c6060566 (patch) | |
| tree | db3703df839b7d265a75fa47c25202c6d083284d /OpenSim/Framework/FriendRegionInfo.cs | |
| parent | Revert "Merge branch 'master' into careminster" (diff) | |
| parent | * Fixes Sitting on the ground. (diff) | |
| download | opensim-SC_OLD-d49d44923d1be38f6fff12706b156562c6060566.zip opensim-SC_OLD-d49d44923d1be38f6fff12706b156562c6060566.tar.gz opensim-SC_OLD-d49d44923d1be38f6fff12706b156562c6060566.tar.bz2 opensim-SC_OLD-d49d44923d1be38f6fff12706b156562c6060566.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Framework/FriendRegionInfo.cs')
0 files changed, 0 insertions, 0 deletions