aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/ThirdParty
diff options
context:
space:
mode:
authorMelanie2011-02-07 22:08:53 +0000
committerMelanie2011-02-07 22:08:53 +0000
commit3889e68c5441218a2ffeb2094b8251d31369837b (patch)
tree69608c869c3823df4f417d9df34866f400045533 /ThirdParty
parentRepair x-query-string (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-3889e68c5441218a2ffeb2094b8251d31369837b.zip
opensim-SC_OLD-3889e68c5441218a2ffeb2094b8251d31369837b.tar.gz
opensim-SC_OLD-3889e68c5441218a2ffeb2094b8251d31369837b.tar.bz2
opensim-SC_OLD-3889e68c5441218a2ffeb2094b8251d31369837b.tar.xz
Merge branch 'master' into careminster-presence-refactor
Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Server/Handlers/Simulation/AgentHandlers.cs OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs OpenSim/Services/GridService/HypergridLinker.cs
Diffstat (limited to 'ThirdParty')
0 files changed, 0 insertions, 0 deletions