diff options
| author | McCabe Maxsted | 2011-09-08 17:49:52 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2011-09-08 17:49:52 -0700 |
| commit | 31e430a85b62e92952400bfc2b092cd39cd8d663 (patch) | |
| tree | 5261a7d54a7689a7e7bc7f6c46d365120fe3f32f /linden/indra/lib/python | |
| parent | Rebranded the Windows isntaller template back to Imp (diff) | |
| download | meta-impy-31e430a85b62e92952400bfc2b092cd39cd8d663.zip meta-impy-31e430a85b62e92952400bfc2b092cd39cd8d663.tar.gz meta-impy-31e430a85b62e92952400bfc2b092cd39cd8d663.tar.bz2 meta-impy-31e430a85b62e92952400bfc2b092cd39cd8d663.tar.xz | |
Fixed windows packaging merge errors
Diffstat (limited to 'linden/indra/lib/python')
| -rw-r--r-- | linden/indra/lib/python/indra/util/llmanifest.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/lib/python/indra/util/llmanifest.py b/linden/indra/lib/python/indra/util/llmanifest.py index 3cd8786..20875f9 100644 --- a/linden/indra/lib/python/indra/util/llmanifest.py +++ b/linden/indra/lib/python/indra/util/llmanifest.py | |||
| @@ -126,7 +126,7 @@ ARGUMENTS=[ | |||
| 126 | default="Release"), | 126 | default="Release"), |
| 127 | dict(name='branding_id', description="""Identifier for the branding set to | 127 | dict(name='branding_id', description="""Identifier for the branding set to |
| 128 | use. Currently, 'imprudence')""", | 128 | use. Currently, 'imprudence')""", |
| 129 | default='inworldz'), | 129 | default='imprudence'), |
| 130 | dict(name='configuration', | 130 | dict(name='configuration', |
| 131 | description="""The build configuration used. On OSX this is | 131 | description="""The build configuration used. On OSX this is |
| 132 | Universal, etc. On Windows it's the *actual* buildtype for | 132 | Universal, etc. On Windows it's the *actual* buildtype for |