diff options
| author | Aaron Brashears <aaronb@lindenlab.com> | 2007-09-13 00:51:23 +0000 |
|---|---|---|
| committer | Aaron Brashears <aaronb@lindenlab.com> | 2007-09-13 00:51:23 +0000 |
| commit | 3d58b54f0e5aeb86efad2450cc4698662e3f4347 (patch) | |
| tree | 0f3530a886725a9deeebd0a73bdfa39a08994515 /indra/llcommon | |
| parent | 55e52f363195ca7428a2b3773d8488d09e62b04d (diff) | |
Result of svn merge -r64890:69433 svn+ssh://svn/svn/linden/branches/dpo-4 into release. had to blow away the libraries directory to clear up svn evil.
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llversionserver.h | 2 | ||||
| -rw-r--r-- | indra/llcommon/llversionviewer.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h index 36c2bdcddb..03bc415af3 100644 --- a/indra/llcommon/llversionserver.h +++ b/indra/llcommon/llversionserver.h @@ -12,7 +12,7 @@ const S32 LL_VERSION_MAJOR = 1; const S32 LL_VERSION_MINOR = 18; const S32 LL_VERSION_PATCH = 2; -const S32 LL_VERSION_BUILD = 0; +const S32 LL_VERSION_BUILD = 46464; const char * const LL_CHANNEL = "Second Life Server"; diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index c952ad47f8..7edef268bd 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 = 3; -const S32 LL_VERSION_BUILD = 2; +const S32 LL_VERSION_PATCH = 2; +const S32 LL_VERSION_BUILD = 46464; const char * const LL_CHANNEL = "Second Life Release"; |