diff options
| author | simon <none@none> | 2013-04-15 11:22:45 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-04-15 11:22:45 -0700 |
| commit | b458923ea430880934f7fcc38a3e99e678e79b11 (patch) | |
| tree | 81902df708145db6520ff6d1c817f1b23eca7cd7 | |
| parent | 066f2acadf6f1624fcdfc22263a890c370473887 (diff) | |
| parent | fac6ee27f2d3277494f011271064b0e5e7e02554 (diff) | |
Merge in viewer-development once more, 'cause it feels good
| -rw-r--r-- | .hgtags | 3 | ||||
| -rw-r--r-- | indra/llcommon/llversionviewer.h | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -436,4 +436,7 @@ fd6b510e83f56830e45670c428653134899d3e25 DRTVWR-305 902caf2b9fdbdbc5c399c4d5ebcecaf9cb97bab8 DRTVWR-306 5c6098fd17d40ee3a38ca6b64f6be9db7f61f0a8 3.5.0-beta7 adc360e6bf21390d2665380951d85937cd29a604 3.5.0-release +0ca3910763cec967703e45bc6208a325dccb9f95 3.5.1-beta1 1ada73295ed0eaa4a772ef079c29f57069342c32 DRTVWR-310 +0ca3910763cec967703e45bc6208a325dccb9f95 3.5.1-beta1 +20cdf370f5c8be6193bef6fb3a81cc3f81275191 3.5.1-beta1 diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index ae5e3ecade..0ea130e86b 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -29,7 +29,7 @@ const S32 LL_VERSION_MAJOR = 3; const S32 LL_VERSION_MINOR = 5; -const S32 LL_VERSION_PATCH = 1; +const S32 LL_VERSION_PATCH = 2; const S32 LL_VERSION_BUILD = 264760; const char * const LL_CHANNEL = "Second Life Developer"; |