ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-15 03:15:41 +08:00
Code Issues Packages Projects Releases Wiki Activity
Files
c5520dc83fbbab83bd341b77f7b137443988b0fc
opensim/OpenSim
History
Melanie c5520dc83f Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-04-24 21:30:12 +01:00
..
ApplicationPlugins
Merge branch 'master' into careminster
2012-02-04 11:48:20 +00:00
Capabilities
Guard against null inventory contents.
2012-04-06 11:22:30 -07:00
ConsoleClient
…
Data
Merge branch 'master' into careminster
2012-04-24 21:30:12 +01:00
Framework
Merge branch 'master' into careminster
2012-04-23 20:44:41 +01:00
Region
Merge branch 'master' into careminster
2012-04-24 21:30:12 +01:00
Server
Merge branch 'master' into careminster
2012-04-07 04:52:14 +01:00
Services
Merge branch 'master' into careminster
2012-04-24 21:30:12 +01:00
Tests
Merge branch 'master' into careminster
2012-04-22 15:06:06 +01:00
Tools
minor: Rename pCampbot console prompt to "pCampbot" rather than "Region"
2012-03-02 01:54:48 +00:00