diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-04-02 11:28:41 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-04-02 11:28:41 -0400 |
| commit | 5f5732365b3c5a3b85fdc0be6fbbbbc0c2de01f2 (patch) | |
| tree | 1b73d0d792c7d4bc9750b101d3dc9a6450cfe80d | |
| parent | f61f5d1c10ee5bb493355ce9a96beb455199e8b3 (diff) | |
| parent | 90b56ee9fa95ca8cc15e3abc81977f504eb32c5b (diff) | |
merge changes for 3.5.0-beta7
| -rw-r--r-- | .hgtags | 1 | ||||
| -rw-r--r-- | indra/llcommon/llversionviewer.h | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -432,3 +432,4 @@ dd058a6093c493120d67c8e02c812c0f7b2d3db0 3.5.0-beta5 fd6b510e83f56830e45670c428653134899d3e25 DRTVWR-305 55339537d99afc394d1bb7fdb7d074bf321ca62f 3.5.0-beta6 902caf2b9fdbdbc5c399c4d5ebcecaf9cb97bab8 DRTVWR-306 +5c6098fd17d40ee3a38ca6b64f6be9db7f61f0a8 3.5.0-beta7 diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index 1554e9e665..0b0c74b3d3 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 = 0; +const S32 LL_VERSION_PATCH = 1; const S32 LL_VERSION_BUILD = 0; const char * const LL_CHANNEL = "Second Life Developer"; |