diff options
| author | Melanie | 2013-03-15 23:45:32 +0000 |
|---|---|---|
| committer | Melanie | 2013-03-15 23:45:32 +0000 |
| commit | b9146a79220c7e15ff0241fb6216028ddf15bee8 (patch) | |
| tree | 18e3342a99e448b19a1a5bb29d9579ef9d9bb817 /prebuild.xml | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Change the table and field names of XAssetService mysql db tables to be capit... (diff) | |
| download | opensim-SC_OLD-b9146a79220c7e15ff0241fb6216028ddf15bee8.zip opensim-SC_OLD-b9146a79220c7e15ff0241fb6216028ddf15bee8.tar.gz opensim-SC_OLD-b9146a79220c7e15ff0241fb6216028ddf15bee8.tar.bz2 opensim-SC_OLD-b9146a79220c7e15ff0241fb6216028ddf15bee8.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Servers/BaseOpenSimServer.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'prebuild.xml')
| -rw-r--r-- | prebuild.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/prebuild.xml b/prebuild.xml index d73f154..8c72aed 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -1019,6 +1019,7 @@ | |||
| 1019 | <Reference name="OpenSim.Framework"/> | 1019 | <Reference name="OpenSim.Framework"/> |
| 1020 | <Reference name="OpenSim.Framework.Console"/> | 1020 | <Reference name="OpenSim.Framework.Console"/> |
| 1021 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 1021 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
| 1022 | <Reference name="OpenSim.Server.Base"/> | ||
| 1022 | <Reference name="OpenSim.Services.Interfaces"/> | 1023 | <Reference name="OpenSim.Services.Interfaces"/> |
| 1023 | <Reference name="OpenSim.Services.Base"/> | 1024 | <Reference name="OpenSim.Services.Base"/> |
| 1024 | <Reference name="OpenSim.Services.Connectors"/> | 1025 | <Reference name="OpenSim.Services.Connectors"/> |