aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/prebuild.xml
diff options
context:
space:
mode:
authorMelanie2013-01-23 19:31:27 +0000
committerMelanie2013-01-23 19:31:27 +0000
commitfc1c77b42d6e35ecb6ad371484f355a3430018b1 (patch)
treee3c5fed0229a21902aa85a80b587e98fe397ac6c /prebuild.xml
parentMerge branch 'master' into careminster (diff)
parentRemove the return value from llGiveMoney (it was a LSL extension of OpenSim) and (diff)
downloadopensim-SC_OLD-fc1c77b42d6e35ecb6ad371484f355a3430018b1.zip
opensim-SC_OLD-fc1c77b42d6e35ecb6ad371484f355a3430018b1.tar.gz
opensim-SC_OLD-fc1c77b42d6e35ecb6ad371484f355a3430018b1.tar.bz2
opensim-SC_OLD-fc1c77b42d6e35ecb6ad371484f355a3430018b1.tar.xz
Merge branch 'avination' into careminster
Diffstat (limited to 'prebuild.xml')
-rw-r--r--prebuild.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/prebuild.xml b/prebuild.xml
index 0f3b55c..c92be99 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1688,6 +1688,7 @@
1688 1688
1689 <!-- To allow regions to have mono addins --> 1689 <!-- To allow regions to have mono addins -->
1690 <Reference name="Mono.Addins" path="../../../bin/"/> 1690 <Reference name="Mono.Addins" path="../../../bin/"/>
1691 <Reference name="SmartThreadPool"/>
1691 1692
1692 <Files> 1693 <Files>
1693 <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/> 1694 <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/>