diff options
| author | Justin Clark-Casey (justincc) | 2013-02-07 23:09:47 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-02-07 23:09:47 +0000 |
| commit | 9e17dc3daa04644c1a565d819a614c02022bdeed (patch) | |
| tree | 014eb8cec88c68b2dedde009a508dde3b5b52aca /prebuild.xml | |
| parent | Fix a recent regression in e17392a where JsonSetValue() stopped working (prob... (diff) | |
| parent | Plumb the path from the client to the extra physics params and back (diff) | |
| download | opensim-SC_OLD-9e17dc3daa04644c1a565d819a614c02022bdeed.zip opensim-SC_OLD-9e17dc3daa04644c1a565d819a614c02022bdeed.tar.gz opensim-SC_OLD-9e17dc3daa04644c1a565d819a614c02022bdeed.tar.bz2 opensim-SC_OLD-9e17dc3daa04644c1a565d819a614c02022bdeed.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'prebuild.xml')
| -rw-r--r-- | prebuild.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/prebuild.xml b/prebuild.xml index 74238d1..68a9539 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -1466,6 +1466,8 @@ | |||
| 1466 | </Files> | 1466 | </Files> |
| 1467 | </Project> | 1467 | </Project> |
| 1468 | 1468 | ||
| 1469 | |||
| 1470 | |||
| 1469 | <Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack.LindenCaps" path="OpenSim/Region/ClientStack/Linden/Caps" type="Library"> | 1471 | <Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack.LindenCaps" path="OpenSim/Region/ClientStack/Linden/Caps" type="Library"> |
| 1470 | <Configuration name="Debug"> | 1472 | <Configuration name="Debug"> |
| 1471 | <Options> | 1473 | <Options> |
| @@ -1508,6 +1510,7 @@ | |||
| 1508 | </Files> | 1510 | </Files> |
| 1509 | </Project> | 1511 | </Project> |
| 1510 | 1512 | ||
| 1513 | |||
| 1511 | <Project frameworkVersion="v3_5" name="OpenSim.Region.CoreModules" path="OpenSim/Region/CoreModules" type="Library"> | 1514 | <Project frameworkVersion="v3_5" name="OpenSim.Region.CoreModules" path="OpenSim/Region/CoreModules" type="Library"> |
| 1512 | <Configuration name="Debug"> | 1515 | <Configuration name="Debug"> |
| 1513 | <Options> | 1516 | <Options> |