summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-02-29 11:10:26 -0800
committerOz Linden <oz@lindenlab.com>2012-02-29 11:10:26 -0800
commit1bbdf941a250bb7296e2ba4968f0fdfb8c6f4d75 (patch)
tree8ae59f6eb997a14cffa036a6e7ba7f8c574f4927 /indra
parent14687b1c37555946f46dc4c7d83554f917ffe066 (diff)
parent5f85e7a82458fff56aa79f7e7fe2986edc069ca3 (diff)
merge tags from beta branch
Diffstat (limited to 'indra')
-rw-r--r--indra/llcommon/llversionviewer.h4
1 files changed, 2 insertions, 2 deletions
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";