diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-09-10 14:18:14 -0700 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-09-10 14:18:14 -0700 |
| commit | 03a23fd2449c72391055311f7d6563985543d34f (patch) | |
| tree | 9f1884c65625f4869af623749bec8f76cd2bd1b1 /indra/llcommon | |
| parent | 2a446ab558f039db4a863f3d287f2ec2369ec8c3 (diff) | |
| parent | 9c5cc00998e240f4bc6061830a162e3daa1d2f81 (diff) | |
Merge changes
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 23e39ceb08..e9e21cffb6 100644 --- a/indra/llcommon/llversionserver.h +++ b/indra/llcommon/llversionserver.h @@ -36,7 +36,7 @@ const S32 LL_VERSION_MAJOR = 1; const S32 LL_VERSION_MINOR = 29; const S32 LL_VERSION_PATCH = 0; -const S32 LL_VERSION_BUILD = 0; +const S32 LL_VERSION_BUILD = 2425; const char * const LL_CHANNEL = "Second Life Server"; diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index 45810a101d..04cf98ce19 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -36,7 +36,7 @@ const S32 LL_VERSION_MAJOR = 2; const S32 LL_VERSION_MINOR = 0; const S32 LL_VERSION_PATCH = 0; -const S32 LL_VERSION_BUILD = 0; +const S32 LL_VERSION_BUILD = 2425; const char * const LL_CHANNEL = "Second Life 2009"; |