diff options
| author | Melanie | 2013-09-07 13:54:19 +0100 |
|---|---|---|
| committer | Melanie | 2013-09-07 13:54:19 +0100 |
| commit | 2f365ea80be0df545a74da03afceb964da1546d1 (patch) | |
| tree | a54202b1cdabaa201c0566232bde69cecdcfef6a /OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-2f365ea80be0df545a74da03afceb964da1546d1.zip opensim-SC-2f365ea80be0df545a74da03afceb964da1546d1.tar.gz opensim-SC-2f365ea80be0df545a74da03afceb964da1546d1.tar.bz2 opensim-SC-2f365ea80be0df545a74da03afceb964da1546d1.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs')
0 files changed, 0 insertions, 0 deletions