diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-03-11 12:05:41 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-03-11 12:05:41 -0500 |
| commit | c208593cdc7fc595585acd1e0e907930779def56 (patch) | |
| tree | 20f2da0ddbeab7c57ad8dfa9f9358c143f8e2b9e | |
| parent | 250cc9c956021ce2cb8b56bae30cd01184807b7b (diff) | |
| parent | 1426765e82549ec9d17a0f90d902f25c0e785bbd (diff) | |
Automated merge up from viewer-development into mesh-development
| -rw-r--r-- | .hgtags | 1 | ||||
| -rw-r--r-- | indra/llcommon/llversionviewer.h | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -73,3 +73,4 @@ b723921b5c711bd24dbe77dc76ef488b544dac78 2.5.0-release b723921b5c711bd24dbe77dc76ef488b544dac78 DRTVWR-31_2.5.0-release 92e58e51776a4f8c29069b1a62ff21454d2085f0 2.6.0-start 63a6aedfce785a6c760377bf685b2dae616797d2 2.5.1-start +4dede9ae1ec74d41f6887719f6f1de7340d8578d 2.5.1-release diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index 15e3ffe1da..3838b2b16c 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -29,7 +29,7 @@ const S32 LL_VERSION_MAJOR = 2; const S32 LL_VERSION_MINOR = 5; -const S32 LL_VERSION_PATCH = 2; +const S32 LL_VERSION_PATCH = 3; const S32 LL_VERSION_BUILD = 0; const char * const LL_CHANNEL = "Second Life Developer"; |