diff options
| author | Jacek Antonelli | 2008-10-17 20:01:38 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-10-17 20:01:38 -0500 |
| commit | fdf944fb0355249d73c4e25ee86e9ffd378e7d4b (patch) | |
| tree | 2e5c51fe0e6d5757f984721e01cc097801d927e7 /linden/indra/llcommon/llversionviewer.h | |
| parent | Rebranded Windows-specific installer/support files. (diff) | |
| parent | Updated source to SL version 1.21.6. (diff) | |
| download | meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.zip meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.gz meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.bz2 meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.xz | |
Merge branch 'merge-1.21.6' into rebranding
Conflicts:
linden/indra/newview/installers/windows/installer_template.nsi
linden/indra/newview/llappviewer.cpp
Diffstat (limited to 'linden/indra/llcommon/llversionviewer.h')
| -rw-r--r-- | linden/indra/llcommon/llversionviewer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h index 385a3e9..bc42359 100644 --- a/linden/indra/llcommon/llversionviewer.h +++ b/linden/indra/llcommon/llversionviewer.h | |||
| @@ -34,7 +34,7 @@ | |||
| 34 | 34 | ||
| 35 | const S32 LL_VERSION_MAJOR = 1; | 35 | const S32 LL_VERSION_MAJOR = 1; |
| 36 | const S32 LL_VERSION_MINOR = 21; | 36 | const S32 LL_VERSION_MINOR = 21; |
| 37 | const S32 LL_VERSION_PATCH = 2; | 37 | const S32 LL_VERSION_PATCH = 6; |
| 38 | const S32 LL_VERSION_BUILD = 0; | 38 | const S32 LL_VERSION_BUILD = 0; |
| 39 | 39 | ||
| 40 | const char * const LL_CHANNEL = "Imprudence"; | 40 | const char * const LL_CHANNEL = "Imprudence"; |