diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-03-27 15:37:40 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-03-27 15:37:40 -0400 |
| commit | e69e229b3c3b8e112708c0f5cc3799166dec67b3 (patch) | |
| tree | 165237713bc63f3f95e6e6933820996886510bc3 | |
| parent | e516b16be7c05f8509c860a63d56ade070b02ccb (diff) | |
| parent | 7cf82d2ae7667e2f9415e04207b2d93696dc4712 (diff) | |
merge fix for MAINT-710
| -rw-r--r-- | .hgtags | 7 | ||||
| -rw-r--r-- | indra/llcommon/llversionviewer.h | 2 |
2 files changed, 5 insertions, 4 deletions
@@ -277,7 +277,8 @@ 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 -3e2fca4ed1a0dc9fe6d8a6664e71098bb035a367 viewer-beta-candidate 28b95a6a28dca3338d9a1f4f204b96678df9f6a5 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"; |