UbitUmarov 7cb3d583a9 merge conflits		2016-11-19 15:45:41 +00:00
..
Addons	fix some invalid string.format arguments	2016-11-09 22:39:52 +00:00
ApplicationPlugins	Finally remove the requirement for an InventoryItem/FolderBase object to	2016-07-04 03:35:48 +01:00
Capabilities	merge conflits	2016-11-19 15:45:41 +00:00
ConsoleClient	Make sure we dispose of WebResponse, StreamReader and Stream in various places where we were not already.	2013-02-27 00:21:02 +00:00
Data	fix some invalid string.format arguments	2016-11-09 22:39:52 +00:00
Framework	merge conflits	2016-11-19 15:45:41 +00:00
Region	merge conflits	2016-11-19 15:45:41 +00:00
Server	fix a debug message	2016-11-17 00:13:21 +00:00
Services	merge conflits	2016-11-19 15:45:41 +00:00
Tests	prevent self call to llSetScriptState(ownname,FALSE) from blocking entire engine	2016-11-13 19:25:32 +00:00
Tools	Pushed AssemblyVersion up to VersionInfo, so that we don't need to do global replace anymore.	2016-02-21 11:14:02 -08:00