Skip to content
Snippets Groups Projects
Commit e69e229b authored by Oz Linden's avatar Oz Linden
Browse files

merge fix for MAINT-710

parents e516b16b 7cf82d2a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.hgtags
+ 4
− 3
View file @ e69e229b
...@@ -277,7 +277,8 @@ d5f263687f43f278107363365938f0a214920a4b DRTVWR-119 ...@@ -277,7 +277,8 @@ d5f263687f43f278107363365938f0a214920a4b DRTVWR-119
d5f263687f43f278107363365938f0a214920a4b 3.3.0-beta1 d5f263687f43f278107363365938f0a214920a4b 3.3.0-beta1
5e8d2662f38a66eca6c591295f5880d47afc73f7 viewer-release-candidate 5e8d2662f38a66eca6c591295f5880d47afc73f7 viewer-release-candidate
5e8d2662f38a66eca6c591295f5880d47afc73f7 3.3.0-release 5e8d2662f38a66eca6c591295f5880d47afc73f7 3.3.0-release
dffd0457ee0745de65bf95f0642a5c9e46b8e2f0 viewer-beta-candidate
3e2fca4ed1a0dc9fe6d8a6664e71098bb035a367 viewer-beta-candidate
3e2fca4ed1a0dc9fe6d8a6664e71098bb035a367 viewer-beta-candidate
28b95a6a28dca3338d9a1f4f204b96678df9f6a5 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
indra/llcommon/llversionviewer.h
+ 1
− 1
View file @ e69e229b
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
const S32 LL_VERSION_MAJOR = 3; const S32 LL_VERSION_MAJOR = 3;
const S32 LL_VERSION_MINOR = 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 S32 LL_VERSION_BUILD = 0;
const char * const LL_CHANNEL = "Second Life Developer"; const char * const LL_CHANNEL = "Second Life Developer";
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment