diff options
author | Merov Linden <merov@lindenlab.com> | 2014-05-06 18:21:04 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2014-05-06 18:21:04 -0700 |
commit | 8dae4bc222d1b0744254442ab0b26538285341de (patch) | |
tree | 88da67f01f0dc32457b4a5085d5e699ea55715a4 /BuildParams | |
parent | f6bb6a0f935323434a3f3d0d94e94c8d8238effe (diff) | |
parent | d0ef02c23a7a37c8c9bfe3a86bae88bb811fc9fe (diff) |
Pull merge from lindenlab/viewer-release. Fixed some conflicts and compile errors
Diffstat (limited to 'BuildParams')
-rwxr-xr-x | BuildParams | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/BuildParams b/BuildParams index 51434a4912..1c9534ad7c 100755 --- a/BuildParams +++ b/BuildParams @@ -201,8 +201,6 @@ runway.viewer_grid = agni runway.build_debug_release_separately = true runway.build_CYGWIN_Debug = false runway.build_viewer_update_version_manager = false - - # eof |