Skip to content
Snippets Groups Projects
Commit c537b639 authored by simon's avatar simon
Browse files

Merge

parents 98f43865 3e5fb382
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.hgtags
+ 3
− 0
View file @ c537b639
...@@ -436,4 +436,7 @@ fd6b510e83f56830e45670c428653134899d3e25 DRTVWR-305 ...@@ -436,4 +436,7 @@ fd6b510e83f56830e45670c428653134899d3e25 DRTVWR-305
902caf2b9fdbdbc5c399c4d5ebcecaf9cb97bab8 DRTVWR-306 902caf2b9fdbdbc5c399c4d5ebcecaf9cb97bab8 DRTVWR-306
5c6098fd17d40ee3a38ca6b64f6be9db7f61f0a8 3.5.0-beta7 5c6098fd17d40ee3a38ca6b64f6be9db7f61f0a8 3.5.0-beta7
adc360e6bf21390d2665380951d85937cd29a604 3.5.0-release adc360e6bf21390d2665380951d85937cd29a604 3.5.0-release
0ca3910763cec967703e45bc6208a325dccb9f95 3.5.1-beta1
1ada73295ed0eaa4a772ef079c29f57069342c32 DRTVWR-310 1ada73295ed0eaa4a772ef079c29f57069342c32 DRTVWR-310
0ca3910763cec967703e45bc6208a325dccb9f95 3.5.1-beta1
20cdf370f5c8be6193bef6fb3a81cc3f81275191 3.5.1-beta1
indra/llcommon/llversionviewer.h
+ 1
− 1
View file @ c537b639
...@@ -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 = 5; 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 S32 LL_VERSION_BUILD = 264760;
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