OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
OpenSimMirror/OpenSim
History
Melanie 36d744e2a5 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
 		2012-07-19 09:47:51 +01:00
..
ApplicationPlugins Merge branch 'master' into careminster 2012-06-13 02:15:12 +01:00
Capabilities Merge branch 'master' into careminster 2012-07-13 02:27:16 +01:00
ConsoleClient Where possible, use the system Encoding.ASCII and Encoding.UTF8 rather than constructing fresh copies. 2012-07-11 22:54:22 +01:00
Data Merge branch 'avination' into careminster 2012-07-11 14:27:33 +01:00
Framework Merge branch 'master' into careminster 2012-07-19 09:47:51 +01:00
Region Merge branch 'master' into careminster 2012-07-19 09:47:51 +01:00
Server Merge branch 'master' into careminster 2012-07-13 02:27:16 +01:00
Services Merge branch 'avination' into careminster 2012-07-16 22:22:42 +01:00
Tests Merge branch 'master' into careminster 2012-07-19 09:47:51 +01:00
Tools Where possible, use the system Encoding.ASCII and Encoding.UTF8 rather than constructing fresh copies. 2012-07-11 22:54:22 +01:00