Files
opensim/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
Melanie 6930d696e9 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
2012-07-25 18:19:12 +01:00

33 KiB