diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-03-26 10:23:40 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-03-26 10:23:40 -0700 |
| commit | 7219c072a8b08c35feffcfa2468b38e1132ad5cc (patch) | |
| tree | 76c21f7265c8580d88e33f7c0d82ead2d5dfd394 | |
| parent | f0dafcfc7ce0c7c310ccb076b42572e0479754e2 (diff) | |
| parent | 7cf82d2ae7667e2f9415e04207b2d93696dc4712 (diff) | |
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-development.
| -rw-r--r-- | .hgtags | 8 | ||||
| -rw-r--r-- | indra/llcommon/llversionviewer.h | 2 |
2 files changed, 9 insertions, 1 deletions
@@ -275,3 +275,11 @@ d5f263687f43f278107363365938f0a214920a4b 3.3.0-start dffd0457ee0745de65bf95f0642a5c9e46b8e2f0 viewer-beta-candidate d5f263687f43f278107363365938f0a214920a4b DRTVWR-119 d5f263687f43f278107363365938f0a214920a4b 3.3.0-beta1 +5e8d2662f38a66eca6c591295f5880d47afc73f7 viewer-release-candidate +5e8d2662f38a66eca6c591295f5880d47afc73f7 3.3.0-release +dffd0457ee0745de65bf95f0642a5c9e46b8e2f0 viewer-beta-candidate +3e2fca4ed1a0dc9fe6d8a6664e71098bb035a367 viewer-beta-candidate +b43cd25be49e3984ff5361cefad020e069131d98 3.3.1-start +3e2fca4ed1a0dc9fe6d8a6664e71098bb035a367 DRTVWR-125 +b43cd25be49e3984ff5361cefad020e069131d98 3.3.1-start +3e2fca4ed1a0dc9fe6d8a6664e71098bb035a367 3.3.1-start diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index 26ff1b5c55..fafc750690 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 = 3; -const S32 LL_VERSION_PATCH = 1; +const S32 LL_VERSION_PATCH = 2; const S32 LL_VERSION_BUILD = 0; const char * const LL_CHANNEL = "Second Life Developer"; |