diff options
| author | Melanie | 2012-08-14 21:44:25 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-14 21:44:25 +0100 |
| commit | 66de4a138935c66d260db0c5d0108d5c73d8da76 (patch) | |
| tree | 7b5e2f3a9ed1c0835d78efd82cd6bca75260a6fc /OpenSim/Framework/IClientAPI.cs | |
| parent | Comment spammy debug (diff) | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC_OLD-66de4a138935c66d260db0c5d0108d5c73d8da76.zip opensim-SC_OLD-66de4a138935c66d260db0c5d0108d5c73d8da76.tar.gz opensim-SC_OLD-66de4a138935c66d260db0c5d0108d5c73d8da76.tar.bz2 opensim-SC_OLD-66de4a138935c66d260db0c5d0108d5c73d8da76.tar.xz | |
Merge branch 'careminster' into avination
Conflicts:
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
Diffstat (limited to 'OpenSim/Framework/IClientAPI.cs')
0 files changed, 0 insertions, 0 deletions