diff options
| author | Palmer <palmer@lindenlab.com> | 2010-06-11 13:14:05 -0700 |
|---|---|---|
| committer | Palmer <palmer@lindenlab.com> | 2010-06-11 13:14:05 -0700 |
| commit | 8421c0096707969cc5dcf68f9ff7b8088a2ee325 (patch) | |
| tree | d6fc68da4b8810d1787be8ff434d9ccb4a465ad6 /indra/llcommon | |
| parent | 173de446b78d6d9aeb934a0e09f9ad6022f64869 (diff) | |
| parent | 571c2bc5e5190cae7324dd235f9c44db9823327a (diff) | |
mergin mergin mergin.
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llversionserver.h | 6 | ||||
| -rw-r--r-- | indra/llcommon/llversionviewer.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h index e3663544db..87fe7001e0 100644 --- a/indra/llcommon/llversionserver.h +++ b/indra/llcommon/llversionserver.h @@ -33,10 +33,10 @@ #ifndef LL_LLVERSIONSERVER_H #define LL_LLVERSIONSERVER_H -const S32 LL_VERSION_MAJOR = 1; -const S32 LL_VERSION_MINOR = 31; +const S32 LL_VERSION_MAJOR = 2; +const S32 LL_VERSION_MINOR = 1; const S32 LL_VERSION_PATCH = 0; -const S32 LL_VERSION_BUILD = 203110; +const S32 LL_VERSION_BUILD = 0; const char * const LL_CHANNEL = "Second Life Server"; diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index fc3ce6df7e..6e341b83a1 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -34,8 +34,8 @@ #define LL_LLVERSIONVIEWER_H const S32 LL_VERSION_MAJOR = 2; -const S32 LL_VERSION_MINOR = 0; -const S32 LL_VERSION_PATCH = 2; +const S32 LL_VERSION_MINOR = 1; +const S32 LL_VERSION_PATCH = 0; const S32 LL_VERSION_BUILD = 0; const char * const LL_CHANNEL = "Second Life Developer"; |