diff options
author | Melanie | 2012-01-21 19:52:33 +0000 |
---|---|---|
committer | Melanie | 2012-01-21 19:52:33 +0000 |
commit | ba3b0c69f11aaa3b4305cddd57099e98325a146d (patch) | |
tree | cf70355a8cac0579354e67eeb3632a6706d41012 /prebuild.xml | |
parent | Add some logging (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-ba3b0c69f11aaa3b4305cddd57099e98325a146d.zip opensim-SC_OLD-ba3b0c69f11aaa3b4305cddd57099e98325a146d.tar.gz opensim-SC_OLD-ba3b0c69f11aaa3b4305cddd57099e98325a146d.tar.bz2 opensim-SC_OLD-ba3b0c69f11aaa3b4305cddd57099e98325a146d.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'prebuild.xml')
-rw-r--r-- | prebuild.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/prebuild.xml b/prebuild.xml index 734952f..7b3181b 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -3196,12 +3196,14 @@ | |||
3196 | <Reference name="OpenSim.Framework.Statistics"/> | 3196 | <Reference name="OpenSim.Framework.Statistics"/> |
3197 | <Reference name="OpenSim.Region.ClientStack"/> | 3197 | <Reference name="OpenSim.Region.ClientStack"/> |
3198 | <Reference name="OpenSim.Region.ClientStack.LindenUDP"/> | 3198 | <Reference name="OpenSim.Region.ClientStack.LindenUDP"/> |
3199 | <Reference name="OpenSim.Region.CoreModules"/> | ||
3199 | <Reference name="OpenSim.Region.Framework"/> | 3200 | <Reference name="OpenSim.Region.Framework"/> |
3200 | <Reference name="OpenSim.Services.Interfaces"/> | 3201 | <Reference name="OpenSim.Services.Interfaces"/> |
3201 | <Reference name="OpenSim.Tests.Common"/> | 3202 | <Reference name="OpenSim.Tests.Common"/> |
3202 | 3203 | ||
3203 | <Files> | 3204 | <Files> |
3204 | <Match pattern="*.cs" recurse="false"/> | 3205 | <Match pattern="*.cs" recurse="false"/> |
3206 | <Match buildAction="EmbeddedResource" path="Resources" pattern="*"/> | ||
3205 | </Files> | 3207 | </Files> |
3206 | </Project> | 3208 | </Project> |
3207 | 3209 | ||