diff options
| author | Christian Goetze <cg@lindenlab.com> | 2008-08-12 17:52:55 +0000 |
|---|---|---|
| committer | Christian Goetze <cg@lindenlab.com> | 2008-08-12 17:52:55 +0000 |
| commit | 93328402371424df7a26eefc6b6866a76a4f308d (patch) | |
| tree | ba75424b9b6760e0bfd30ac46b43f278724011e7 /indra/llcommon | |
| parent | 80be4c1d2d73982ea2df6dd7ef3fc3465416c882 (diff) | |
svn -c 94141 merge svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer-merge-1
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llversionserver.h | 2 | ||||
| -rw-r--r-- | indra/llcommon/llversionviewer.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h index fd5f6497c2..e766a1d7ca 100644 --- a/indra/llcommon/llversionserver.h +++ b/indra/llcommon/llversionserver.h @@ -35,7 +35,7 @@ const S32 LL_VERSION_MAJOR = 1; const S32 LL_VERSION_MINOR = 24; const S32 LL_VERSION_PATCH = 0; -const S32 LL_VERSION_BUILD = 93453; +const S32 LL_VERSION_BUILD = 94081; const char * const LL_CHANNEL = "Second Life Server"; diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index 0555b9ea3c..c8061166da 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -35,7 +35,7 @@ const S32 LL_VERSION_MAJOR = 1; const S32 LL_VERSION_MINOR = 21; const S32 LL_VERSION_PATCH = 0; -const S32 LL_VERSION_BUILD = 0; +const S32 LL_VERSION_BUILD = 94081; const char * const LL_CHANNEL = "Second Life Release"; |