summaryrefslogtreecommitdiff
path: root/indra/llcommon/llversionviewer.h
diff options
context:
space:
mode:
authorcallum <none@none>2011-10-28 11:01:11 -0700
committercallum <none@none>2011-10-28 11:01:11 -0700
commitb94f45db81fa6a4625d58301a13f964996fa65bd (patch)
tree1c9134e08ce22f4e122c48e3a746259a8f7ef470 /indra/llcommon/llversionviewer.h
parentd08d018323272866b189979d0e772d50cdece4b2 (diff)
parentf84a69a7e00f0eed49894e14336126849a9e7b29 (diff)
Merge with head
Diffstat (limited to 'indra/llcommon/llversionviewer.h')
-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 a4b2e06908..aa37a03ef8 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 = 0;
-const S32 LL_VERSION_PATCH = 6;
+const S32 LL_VERSION_MINOR = 2;
+const S32 LL_VERSION_PATCH = 1;
const S32 LL_VERSION_BUILD = 0;
const char * const LL_CHANNEL = "Second Life Developer";