Skip to content
Snippets Groups Projects
Commit 7be4856f authored by Loren Shih's avatar Loren Shih
Browse files

Automated merge up from viewer-development

parents 07d4d9b0 cbb184d9
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.hgtags
+ 1
− 0
View file @ 7be4856f
...@@ -33,3 +33,4 @@ b0cd7e150009809a0b5b0a9d5785cd4bb230413a 2.2.0-beta3 ...@@ -33,3 +33,4 @@ b0cd7e150009809a0b5b0a9d5785cd4bb230413a 2.2.0-beta3
00a831292231faad7e44c69f76cb96f175b8dfad 2.2.0-beta4 00a831292231faad7e44c69f76cb96f175b8dfad 2.2.0-beta4
98e0d6df638429fd2f0476667504bd5a6b298def 2.3.0-beta1 98e0d6df638429fd2f0476667504bd5a6b298def 2.3.0-beta1
1415e6538d54fd5d568ee88343424d57c6803c2c 2.2.0-release 1415e6538d54fd5d568ee88343424d57c6803c2c 2.2.0-release
98e0d6df638429fd2f0476667504bd5a6b298def 2.3.0-start
indra/llcommon/llversionviewer.h
+ 2
− 2
View file @ 7be4856f
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
#define LL_LLVERSIONVIEWER_H #define LL_LLVERSIONVIEWER_H
const S32 LL_VERSION_MAJOR = 2; const S32 LL_VERSION_MAJOR = 2;
const S32 LL_VERSION_MINOR = 2; const S32 LL_VERSION_MINOR = 4;
const S32 LL_VERSION_PATCH = 1; const S32 LL_VERSION_PATCH = 0;
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