lotek/opensim
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Files
52d8fa2d0fa44aab85fc2c14acf00beae61ba37a
opensim/OpenSim/Region/CoreModules/Avatar/Dialog
History
Melanie b975cbcbed Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
	OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
	OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
	OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2011-10-27 18:14:38 +01:00
..
DialogModule.cs
Merge branch 'master' into bigmerge
2011-10-27 18:14:38 +01:00