diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-06-19 12:36:47 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-06-19 12:36:47 -0400 |
| commit | e30fbb2837857bac3592b9be67e4426f1093d87f (patch) | |
| tree | daf8d3fb7744b0faa6dcb70f7a110cf5a2ebf3c2 | |
| parent | d1ac85a589f92981b8031140997a21df633136e2 (diff) | |
| parent | 76abab0618861a6c97c60e6184af5506891f2e9d (diff) | |
merge changes for open-140
| -rw-r--r-- | autobuild.xml | 36 | ||||
| -rw-r--r-- | doc/contributions.txt | 1 |
2 files changed, 37 insertions, 0 deletions
diff --git a/autobuild.xml b/autobuild.xml index 0e4b81324a..fb34117c0c 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2303,6 +2303,18 @@ </map> <key>configure</key> <map> + <key>arguments</key> + <array> + <string>..\indra</string> + <string>&&</string> + <string>..\indra\tools\vstool\VSTool.exe</string> + <string>--solution</string> + <string>SecondLife.sln</string> + <string>--config</string> + <string>Debug</string> + <string>--startup</string> + <string>secondlife-bin</string> + </array> <key>options</key> <array> <string>-G</string> @@ -2379,6 +2391,18 @@ </map> <key>configure</key> <map> + <key>arguments</key> + <array> + <string>..\indra</string> + <string>&&</string> + <string>..\indra\tools\vstool\VSTool.exe</string> + <string>--solution</string> + <string>SecondLife.sln</string> + <string>--config</string> + <string>RelWithDebInfo</string> + <string>--startup</string> + <string>secondlife-bin</string> + </array> <key>options</key> <array> <string>-G</string> @@ -2455,6 +2479,18 @@ </map> <key>configure</key> <map> + <key>arguments</key> + <array> + <string>..\indra</string> + <string>&&</string> + <string>..\indra\tools\vstool\VSTool.exe</string> + <string>--solution</string> + <string>SecondLife.sln</string> + <string>--config</string> + <string>Release</string> + <string>--startup</string> + <string>secondlife-bin</string> + </array> <key>options</key> <array> <string>-G</string> diff --git a/doc/contributions.txt b/doc/contributions.txt index 221404723d..c3c0104583 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -1095,6 +1095,7 @@ Sudane Erato Synystyr Texan Takeda Terrawyng TankMaster Finesmith + OPEN-140 OPEN-142 STORM-1100 STORM-1258 |