ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-14 09:25:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	bin/HttpServer_OpenSim.dll
This commit is contained in:
Melanie
2013-02-07 20:51:51 +00:00
parent 6aa876a83b af73ea909c
commit 45f5a6a6db
12 changed files with 5877 additions and 4542 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
prebuild.xml
View File

@@ -1587,6 +1587,8 @@
</Files>
</Project>
<Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack.LindenCaps" path="OpenSim/Region/ClientStack/Linden/Caps" type="Library">
<Configuration name="Debug">
<Options>
@@ -1631,6 +1633,7 @@
</Files>
</Project>
<Project frameworkVersion="v3_5" name="OpenSim.Region.CoreModules" path="OpenSim/Region/CoreModules" type="Library">
<Configuration name="Debug">
<Options>