aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/HttpServer/OSHttpServer.cs
diff options
context:
space:
mode:
authorMelanie2012-01-23 00:24:31 +0000
committerMelanie2012-01-23 00:24:31 +0000
commitcd2bf64b873b4f34ead9f37a9f0e4605266e3617 (patch)
tree2824d0d90620f05f6aa7306ac506172f9826b8d5 /OpenSim/Framework/Servers/HttpServer/OSHttpServer.cs
parentMerge branch 'master' into careminster (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-cd2bf64b873b4f34ead9f37a9f0e4605266e3617.zip
opensim-SC_OLD-cd2bf64b873b4f34ead9f37a9f0e4605266e3617.tar.gz
opensim-SC_OLD-cd2bf64b873b4f34ead9f37a9f0e4605266e3617.tar.bz2
opensim-SC_OLD-cd2bf64b873b4f34ead9f37a9f0e4605266e3617.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions