Merge branch 'queuetest' of ssh://opensimulator.org/var/git/opensim into queuetest

Browse Source

Conflicts:
	OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
	OpenSim/Region/Framework/Scenes/Prioritizer.cs

...

This commit is contained in:

Mic Bowman

2011-04-04 14:25:21 -07:00

parent 8b134f37f2 61371c7c16

commit 65af4bacc9

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available