diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-02-29 11:10:26 -0800 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-02-29 11:10:26 -0800 |
| commit | 1bbdf941a250bb7296e2ba4968f0fdfb8c6f4d75 (patch) | |
| tree | 8ae59f6eb997a14cffa036a6e7ba7f8c574f4927 | |
| parent | 14687b1c37555946f46dc4c7d83554f917ffe066 (diff) | |
| parent | 5f85e7a82458fff56aa79f7e7fe2986edc069ca3 (diff) | |
merge tags from beta branch
| -rw-r--r-- | .hgtags | 1 | ||||
| -rw-r--r-- | indra/llcommon/llversionviewer.h | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -268,3 +268,4 @@ e9c82fca5ae6fb8a8af29012d78fb194a29323f3 DRTVWR-117_3.2.9-beta1 e9c82fca5ae6fb8a8af29012d78fb194a29323f3 3.2.9-beta1 a01ef9bed28627f4ca543fbc1d70c79cc297a90f DRTVWR-118_3.2.9-beta2 a01ef9bed28627f4ca543fbc1d70c79cc297a90f 3.2.9-beta2 +987425b1acf4752379b2e1eb20944b4b35d67a85 3.2.8-beta2 diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index 27cdfcaa4e..a869c74189 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -28,8 +28,8 @@ #define LL_LLVERSIONVIEWER_H const S32 LL_VERSION_MAJOR = 3; -const S32 LL_VERSION_MINOR = 2; -const S32 LL_VERSION_PATCH = 9; +const S32 LL_VERSION_MINOR = 3; +const S32 LL_VERSION_PATCH = 0; const S32 LL_VERSION_BUILD = 0; const char * const LL_CHANNEL = "Second Life Developer"; |