diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-01-12 12:53:44 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-01-12 12:53:44 +0200 |
| commit | 3c3271761b918a19f7a10d80da9dd23e5127de2c (patch) | |
| tree | d4205dd5827c215b2cb615bc364b01b1b7eada0d /indra/lib | |
| parent | 13148203a440cf1bb36c928a8677bfeb7c0e32d6 (diff) | |
| parent | 3b2697cb93e6b8a1f1281aeab0e960bc6704d8c4 (diff) | |
Merge with default branch, resolved conflict in llpanelavatar.cpp
--HG--
branch : product-engine
Diffstat (limited to 'indra/lib')
| -rw-r--r-- | indra/lib/python/indra/util/llmanifest.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/lib/python/indra/util/llmanifest.py b/indra/lib/python/indra/util/llmanifest.py index 8c05210618..7e5b86c53f 100644 --- a/indra/lib/python/indra/util/llmanifest.py +++ b/indra/lib/python/indra/util/llmanifest.py @@ -119,6 +119,7 @@ ARGUMENTS=[ On Linux this would try to use Linux_i686Manifest.""", default=""), dict(name='build', description='Build directory.', default=DEFAULT_SRCTREE), + dict(name='buildtype', description='Build type (i.e. Debug, Release, RelWithDebInfo).', default=None), dict(name='configuration', description="""The build configuration used.""", default="Release"), |