Files
opensim/bin
Melanie 669fa3ff9a Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
2013-05-30 21:48:09 +01:00
..
2012-12-13 00:05:34 -05:00
2012-12-13 00:05:34 -05:00
2009-08-10 08:14:57 -07:00
2013-05-09 10:50:18 -04:00
2013-05-09 10:50:18 -04:00