aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/prebuild.xml
diff options
context:
space:
mode:
authorMelanie2010-05-21 03:51:58 +0100
committerMelanie2010-05-21 03:51:58 +0100
commita92780fe5f31a38b2f00459ef00ca28127a60dcf (patch)
treef89850a27564abd01f1b3aaf72aa24001e165a26 /prebuild.xml
parentRefactor scene presence list for lockless iteration. Lock contention will now... (diff)
parentCleaned up MySql migrations a bit more, got rid of all old-form migration fil... (diff)
downloadopensim-SC_OLD-a92780fe5f31a38b2f00459ef00ca28127a60dcf.zip
opensim-SC_OLD-a92780fe5f31a38b2f00459ef00ca28127a60dcf.tar.gz
opensim-SC_OLD-a92780fe5f31a38b2f00459ef00ca28127a60dcf.tar.bz2
opensim-SC_OLD-a92780fe5f31a38b2f00459ef00ca28127a60dcf.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'prebuild.xml')
-rw-r--r--prebuild.xml4
1 files changed, 4 insertions, 0 deletions
diff --git a/prebuild.xml b/prebuild.xml
index b960553..2706c8e 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2171,6 +2171,7 @@
2171 <Exclude name="Tests" pattern="Tests" /> 2171 <Exclude name="Tests" pattern="Tests" />
2172 </Match> 2172 </Match>
2173 <Match path="Resources" pattern="*.sql" buildAction="EmbeddedResource"/> 2173 <Match path="Resources" pattern="*.sql" buildAction="EmbeddedResource"/>
2174 <Match path="Resources" pattern="*.migrations" buildAction="EmbeddedResource"/>
2174 <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/> 2175 <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
2175 </Files> 2176 </Files>
2176 </Project> 2177 </Project>
@@ -2204,6 +2205,7 @@
2204 <Files> 2205 <Files>
2205 <Match pattern="*.cs" recurse="true"/> 2206 <Match pattern="*.cs" recurse="true"/>
2206 <Match path="Resources" pattern="*.sql" buildAction="EmbeddedResource"/> 2207 <Match path="Resources" pattern="*.sql" buildAction="EmbeddedResource"/>
2208 <Match path="Resources" pattern="*.migrations" buildAction="EmbeddedResource"/>
2207 <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/> 2209 <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
2208 </Files> 2210 </Files>
2209 </Project> 2211 </Project>
@@ -2241,6 +2243,7 @@
2241 <Exclude name="Tests" pattern="Tests" /> 2243 <Exclude name="Tests" pattern="Tests" />
2242 </Match> 2244 </Match>
2243 <Match path="Resources" pattern="*.sql" buildAction="EmbeddedResource"/> 2245 <Match path="Resources" pattern="*.sql" buildAction="EmbeddedResource"/>
2246 <Match path="Resources" pattern="*.migrations" buildAction="EmbeddedResource"/>
2244 <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/> 2247 <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
2245 </Files> 2248 </Files>
2246 </Project> 2249 </Project>
@@ -2277,6 +2280,7 @@
2277 <Exclude name="Tests" pattern="Tests" /> 2280 <Exclude name="Tests" pattern="Tests" />
2278 </Match> 2281 </Match>
2279 <Match path="Resources" pattern="*.sql" buildAction="EmbeddedResource"/> 2282 <Match path="Resources" pattern="*.sql" buildAction="EmbeddedResource"/>
2283 <Match path="Resources" pattern="*.migrations" buildAction="EmbeddedResource"/>
2280 <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/> 2284 <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
2281 </Files> 2285 </Files>
2282 </Project> 2286 </Project>