Files
opensim/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
Melanie 9a5679876e Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
	OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
2012-11-13 02:10:09 +00:00

32 KiB