diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-09-13 18:17:52 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-09-13 18:17:52 +0000 |
| commit | b3d807d5ff8dca6c891e9a5e0ddc7bc147d69f8c (patch) | |
| tree | 8b94c90d06bcd0ed5d258ab1e8c5d67024683cab /indra/llcommon/llversionviewer.h | |
| parent | a5f3ac2a8dc9aee2c04f24c3b3304c1b24808acb (diff) | |
svn merge -r 68690:69597 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Viewer --> release
Merge patches made in the 1-18-3 RC iterations into the trunk.
NOTE: Includes the reversion of SL-51274 (originally maintenance r67559, changed lltracker.cpp)
Diffstat (limited to 'indra/llcommon/llversionviewer.h')
| -rw-r--r-- | indra/llcommon/llversionviewer.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index 7edef268bd..c6405a1b01 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -11,8 +11,8 @@ const S32 LL_VERSION_MAJOR = 1; const S32 LL_VERSION_MINOR = 18; -const S32 LL_VERSION_PATCH = 2; -const S32 LL_VERSION_BUILD = 46464; +const S32 LL_VERSION_PATCH = 3; +const S32 LL_VERSION_BUILD = 3; const char * const LL_CHANNEL = "Second Life Release"; |