diff options
| author | Justin Clark-Casey (justincc) | 2014-03-25 00:20:38 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2014-03-25 00:20:38 +0000 |
| commit | 091f3a80008a0f4a756fcb9ff4e87a24c2948c3c (patch) | |
| tree | a98354e9317e0ed6892dec344a69447c0e9c70b8 /Prebuild/prebuild.xml | |
| parent | Don't fail to enable permissions modules correctly if there is any leading or... (diff) | |
| parent | Fixed Debug command for Groups. (Use of wrong capitalization caused *two* "de... (diff) | |
| download | opensim-SC-091f3a80008a0f4a756fcb9ff4e87a24c2948c3c.zip opensim-SC-091f3a80008a0f4a756fcb9ff4e87a24c2948c3c.tar.gz opensim-SC-091f3a80008a0f4a756fcb9ff4e87a24c2948c3c.tar.bz2 opensim-SC-091f3a80008a0f4a756fcb9ff4e87a24c2948c3c.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | Prebuild/prebuild.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Prebuild/prebuild.xml b/Prebuild/prebuild.xml index 588d788..f39175b 100644 --- a/Prebuild/prebuild.xml +++ b/Prebuild/prebuild.xml | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8" ?> | 1 | <?xml version="1.0" encoding="utf-8" ?> |
| 2 | <Prebuild xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.9.xsd" version="1.9"> | 2 | <Prebuild xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.10.xsd" version="1.10"> |
| 3 | <Solution name="Prebuild" version="2.0.5"> | 3 | <Solution name="Prebuild" version="2.0.6"> |
| 4 | <Configuration name="Debug"> | 4 | <Configuration name="Debug"> |
| 5 | <Options> | 5 | <Options> |
| 6 | <CompilerDefines>DEBUG;TRACE</CompilerDefines> | 6 | <CompilerDefines>DEBUG;TRACE</CompilerDefines> |
| @@ -31,7 +31,7 @@ | |||
| 31 | type="Exe" | 31 | type="Exe" |
| 32 | rootNamespace="Prebuild" | 32 | rootNamespace="Prebuild" |
| 33 | startupObject="Prebuild.Prebuild" | 33 | startupObject="Prebuild.Prebuild" |
| 34 | version="2.0.5" | 34 | version="2.0.6" |
| 35 | frameworkVersion="v3_5" | 35 | frameworkVersion="v3_5" |
| 36 | > | 36 | > |
| 37 | <Author>Matthew Holmes (matthew@wildfiregames.com)</Author> | 37 | <Author>Matthew Holmes (matthew@wildfiregames.com)</Author> |
| @@ -66,7 +66,7 @@ | |||
| 66 | <Reference name="System" /> | 66 | <Reference name="System" /> |
| 67 | <Files> | 67 | <Files> |
| 68 | <Match pattern="App.ico" buildAction="EmbeddedResource"/> | 68 | <Match pattern="App.ico" buildAction="EmbeddedResource"/> |
| 69 | <Match path="data" pattern="prebuild-1.9.xsd" buildAction="EmbeddedResource"/> | 69 | <Match path="data" pattern="prebuild-1.10.xsd" buildAction="EmbeddedResource"/> |
| 70 | <Match path="data" pattern="autotools.xml" buildAction="EmbeddedResource"/> | 70 | <Match path="data" pattern="autotools.xml" buildAction="EmbeddedResource"/> |
| 71 | <Match pattern="*.cs" recurse="true"/> | 71 | <Match pattern="*.cs" recurse="true"/> |
| 72 | </Files> | 72 | </Files> |